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

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

Browse Source
This commit is contained in:
Henri Verbeet 2011-04-21 22:39:32 +02:00 committed by Alexandre Julliard
parent cc39bde98d
commit c852200b03
4 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/d3d9/surface.c
View File

@ -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: */

2
dlls/wined3d/surface.c
View File

@ -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,

5
dlls/wined3d/surface_base.c
View File

@ -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);

2
include/wine/wined3d.idl
View File

@ -2194,8 +2194,6 @@ interface IWineD3DSurface : IUnknown
);
void PreLoad(
);
WINED3DRESOURCETYPE GetType(
);
struct wined3d_resource *GetResource(
);
HRESULT Map(