wined3d: Get rid of IWineD3DSurface::GetType().

diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c
index cedd30fd9e6c1d9b0f8131e79edf48e81764c6b7..7cca2d693e75f2aedaecf6556979dd15281c45c5 100644 (file)
--- a/dlls/d3d9/surface.c
+++ b/dlls/d3d9/surface.c
@@ -210,17 +210,11 @@ static void WINAPI IDirect3DSurface9Impl_PreLoad(LPDIRECT3DSURFACE9 iface) {
     wined3d_mutex_unlock();
 }
 
-static D3DRESOURCETYPE WINAPI IDirect3DSurface9Impl_GetType(LPDIRECT3DSURFACE9 iface) {
-    IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface;
-    D3DRESOURCETYPE ret;
-
+static D3DRESOURCETYPE WINAPI IDirect3DSurface9Impl_GetType(IDirect3DSurface9 *iface)
+{
     TRACE("iface %p.\n", iface);
 
-    wined3d_mutex_lock();
-    ret = IWineD3DSurface_GetType(This->wineD3DSurface);
-    wined3d_mutex_unlock();
-
-    return ret;
+    return D3DRTYPE_SURFACE;
 }
 
 /* IDirect3DSurface9 Interface follow: */

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index d302d35c2200868832a3d39e06049627b3ca4d56..7aa62c94a6b54328ab55e29174c33b506ba25a9a 100644 (file)
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -4922,7 +4922,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl =
     IWineD3DBaseSurfaceImpl_SetPriority,
     IWineD3DBaseSurfaceImpl_GetPriority,
     IWineD3DSurfaceImpl_PreLoad,
-    IWineD3DBaseSurfaceImpl_GetType,
     /* IWineD3DSurface */
     IWineD3DBaseSurfaceImpl_GetResource,
     IWineD3DSurfaceImpl_Map,
@@ -5550,7 +5549,6 @@ static const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl =
     IWineD3DBaseSurfaceImpl_SetPriority,
     IWineD3DBaseSurfaceImpl_GetPriority,
     IWineGDISurfaceImpl_PreLoad,
-    IWineD3DBaseSurfaceImpl_GetType,
     /* IWineD3DSurface */
     IWineD3DBaseSurfaceImpl_GetResource,
     IWineGDISurfaceImpl_Map,

diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c
index 6bd073d3a49f5ddfd638fd057015f77d4e0c561a..d764ff4184f4e1d28a9804befdf18262a18c2777 100644 (file)
--- a/dlls/wined3d/surface_base.c
+++ b/dlls/wined3d/surface_base.c
@@ -157,11 +157,6 @@ DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface)
     return resource_get_priority(&((IWineD3DSurfaceImpl *)iface)->resource);
 }
 
-WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface)
-{
-    return resource_get_type(&((IWineD3DSurfaceImpl *)iface)->resource);
-}
-
 void * WINAPI IWineD3DBaseSurfaceImpl_GetParent(IWineD3DSurface *iface)
 {
     TRACE("iface %p.\n", iface);

diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index 02c0d066480d34b65e0ef8977fbf4379b2e0037c..d536004bddef5e93c0b7cadd26153c222500b65d 100644 (file)
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -2194,8 +2194,6 @@ interface IWineD3DSurface : IUnknown
     );
     void PreLoad(
     );
-    WINED3DRESOURCETYPE GetType(
-    );
     struct wined3d_resource *GetResource(
     );
     HRESULT Map(