ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Get rid of wined3d_texture_get_type().

This commit is contained in:
Henri Verbeet 2011-06-07 11:06:24 +02:00 committed by Alexandre Julliard
parent 1ae309f981
commit 1fbdfd625a
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/wined3d/device.c
View File

@ -4337,8 +4337,8 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device,
} }
/* Verify that the source and destination textures are the same type. */ /* Verify that the source and destination textures are the same type. */
type = wined3d_texture_get_type(src_texture); type = src_texture->resource.resourceType;
if (wined3d_texture_get_type(dst_texture) != type) if (dst_texture->resource.resourceType != type)
{ {
WARN("Source and destination have different types, returning WINED3DERR_INVALIDCALL.\n"); WARN("Source and destination have different types, returning WINED3DERR_INVALIDCALL.\n");
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;

7
dlls/wined3d/texture.c
View File

@ -483,13 +483,6 @@ void CDECL wined3d_texture_preload(struct wined3d_texture *texture)
texture->texture_ops->texture_preload(texture, SRGB_ANY); texture->texture_ops->texture_preload(texture, SRGB_ANY);
} }
WINED3DRESOURCETYPE CDECL wined3d_texture_get_type(const struct wined3d_texture *texture)
{
TRACE("texture %p.\n", texture);
return texture->resource.resourceType;
}
void * CDECL wined3d_texture_get_parent(const struct wined3d_texture *texture) void * CDECL wined3d_texture_get_parent(const struct wined3d_texture *texture)
{ {
TRACE("texture %p.\n", texture); TRACE("texture %p.\n", texture);

1
dlls/wined3d/wined3d.spec
View File

@ -268,7 +268,6 @@
@ cdecl wined3d_texture_get_priority(ptr) @ cdecl wined3d_texture_get_priority(ptr)
@ cdecl wined3d_texture_get_private_data(ptr ptr ptr ptr) @ cdecl wined3d_texture_get_private_data(ptr ptr ptr ptr)
@ cdecl wined3d_texture_get_sub_resource(ptr long) @ cdecl wined3d_texture_get_sub_resource(ptr long)
@ cdecl wined3d_texture_get_type(ptr)
@ cdecl wined3d_texture_incref(ptr) @ cdecl wined3d_texture_incref(ptr)
@ cdecl wined3d_texture_preload(ptr) @ cdecl wined3d_texture_preload(ptr)
@ cdecl wined3d_texture_set_autogen_filter_type(ptr long) @ cdecl wined3d_texture_set_autogen_filter_type(ptr long)

1
include/wine/wined3d.h
View File

@ -2504,7 +2504,6 @@ HRESULT __cdecl wined3d_texture_get_private_data(const struct wined3d_texture *t
REFGUID guid, void *data, DWORD *data_size); REFGUID guid, void *data, DWORD *data_size);
struct wined3d_resource * __cdecl wined3d_texture_get_sub_resource(struct wined3d_texture *texture, struct wined3d_resource * __cdecl wined3d_texture_get_sub_resource(struct wined3d_texture *texture,
UINT sub_resource_idx); UINT sub_resource_idx);
WINED3DRESOURCETYPE __cdecl wined3d_texture_get_type(const struct wined3d_texture *texture);
ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture); ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture);
void __cdecl wined3d_texture_preload(struct wined3d_texture *texture); void __cdecl wined3d_texture_preload(struct wined3d_texture *texture);
HRESULT __cdecl wined3d_texture_set_autogen_filter_type(struct wined3d_texture *texture, HRESULT __cdecl wined3d_texture_set_autogen_filter_type(struct wined3d_texture *texture,