Henri Verbeet : wined3d: Get rid of wined3d_texture_get_type().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1fbdfd625aab1799f24c1c1f4ec1a85e14f29dd0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1fbdfd625aab1799f24c1c1f4e...

Author: Henri Verbeet 
Date:   Tue Jun  7 11:06:24 2011 +0200

wined3d: Get rid of wined3d_texture_get_type().

---

dlls/wined3d/device.c     |    4 ++--
 dlls/wined3d/texture.c    |    7 -------
 dlls/wined3d/wined3d.spec |    1 -
 include/wine/wined3d.h    |    1 -
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index cb60719..c7bade0 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 7abf18a..c138d01 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 45c9aaf..cfdd236 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 ed269f0..aadd5fd 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,