Henri Verbeet : wined3d: Get rid of IWineD3DSurface::GetType().
Alexandre Julliard
julliard at winehq.org
Fri Apr 22 12:27:42 CDT 2011
Module: wine
Branch: master
Commit: c852200b03ab3874ffdd4c02da947163c9f3990a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c852200b03ab3874ffdd4c02da947163c9f3990a
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Apr 21 22:39:32 2011 +0200
wined3d: Get rid of IWineD3DSurface::GetType().
---
dlls/d3d9/surface.c | 12 +++---------
dlls/wined3d/surface.c | 2 --
dlls/wined3d/surface_base.c | 5 -----
include/wine/wined3d.idl | 2 --
4 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c
index cedd30f..7cca2d6 100644
--- 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 d302d35..7aa62c9 100644
--- 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 6bd073d..d764ff4 100644
--- 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 02c0d06..d536004 100644
--- 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(
More information about the wine-cvs
mailing list