diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cb60719122e..c7bade0d419 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -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. */ - type = wined3d_texture_get_type(src_texture); - if (wined3d_texture_get_type(dst_texture) != type) + type = src_texture->resource.resourceType; + if (dst_texture->resource.resourceType != type) { WARN("Source and destination have different types, returning WINED3DERR_INVALIDCALL.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7abf18a7e28..c138d01ba50 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -483,13 +483,6 @@ void CDECL wined3d_texture_preload(struct wined3d_texture *texture) 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) { TRACE("texture %p.\n", texture); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 45c9aafd6e2..cfdd2366cdc 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -268,7 +268,6 @@ @ cdecl wined3d_texture_get_priority(ptr) @ cdecl wined3d_texture_get_private_data(ptr ptr ptr ptr) @ cdecl wined3d_texture_get_sub_resource(ptr long) -@ cdecl wined3d_texture_get_type(ptr) @ cdecl wined3d_texture_incref(ptr) @ cdecl wined3d_texture_preload(ptr) @ cdecl wined3d_texture_set_autogen_filter_type(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ed269f006e9..aadd5fdf155 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2504,7 +2504,6 @@ HRESULT __cdecl wined3d_texture_get_private_data(const struct wined3d_texture *t REFGUID guid, void *data, DWORD *data_size); struct wined3d_resource * __cdecl wined3d_texture_get_sub_resource(struct wined3d_texture *texture, UINT sub_resource_idx); -WINED3DRESOURCETYPE __cdecl wined3d_texture_get_type(const struct wined3d_texture *texture); ULONG __cdecl wined3d_texture_incref(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,