From 89241081f65b8354339ddde183ec100ef4c39361 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Mon, 1 Dec 2008 15:32:15 +0100 Subject: [PATCH] wined3d: IWineD3DBaseTexture and IWineD3DResource don't need Vtbl's. --- dlls/wined3d/basetexture.c | 35 ----------------------------------- dlls/wined3d/resource.c | 19 ------------------- 2 files changed, 54 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 98d9de4104a..5f7d7c47408 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -487,38 +487,3 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface This->baseTexture.states[WINED3DTEXSTA_MAXANISOTROPY] = samplerStates[WINED3DSAMP_MAXANISOTROPY]; } } - - -static const IWineD3DBaseTextureVtbl IWineD3DBaseTexture_Vtbl = -{ - /* IUnknown */ - IWineD3DBaseTextureImpl_QueryInterface, - IWineD3DBaseTextureImpl_AddRef, - IWineD3DBaseTextureImpl_Release, - /* IWineD3DResource */ - IWineD3DBaseTextureImpl_GetParent, - IWineD3DBaseTextureImpl_GetDevice, - IWineD3DBaseTextureImpl_SetPrivateData, - IWineD3DBaseTextureImpl_GetPrivateData, - IWineD3DBaseTextureImpl_FreePrivateData, - IWineD3DBaseTextureImpl_SetPriority, - IWineD3DBaseTextureImpl_GetPriority, - IWineD3DBaseTextureImpl_PreLoad, - IWineD3DBaseTextureImpl_UnLoad, - IWineD3DBaseTextureImpl_GetType, - /*IWineD3DBaseTexture*/ - IWineD3DBaseTextureImpl_SetLOD, - IWineD3DBaseTextureImpl_GetLOD, - IWineD3DBaseTextureImpl_GetLevelCount, - IWineD3DBaseTextureImpl_SetAutoGenFilterType, - IWineD3DBaseTextureImpl_GetAutoGenFilterType, - IWineD3DBaseTextureImpl_GenerateMipSubLevels, - IWineD3DBaseTextureImpl_SetDirty, - IWineD3DBaseTextureImpl_GetDirty, - /* internal */ - IWineD3DBaseTextureImpl_BindTexture, - IWineD3DBaseTextureImpl_GetTextureDimensions, - IWineD3DBaseTextureImpl_IsCondNP2, - IWineD3DBaseTextureImpl_ApplyStateChanges - -}; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index c75e09dcb6f..a642fa5fa14 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -262,22 +262,3 @@ void dumpResources(struct list *list) { FIXME("Leftover resource %p with type %d,%s\n", resource, IWineD3DResource_GetType((IWineD3DResource *) resource), debug_d3dresourcetype(IWineD3DResource_GetType((IWineD3DResource *) resource))); } } - -static const IWineD3DResourceVtbl IWineD3DResource_Vtbl = -{ - /* IUnknown */ - IWineD3DResourceImpl_QueryInterface, - IWineD3DResourceImpl_AddRef, - IWineD3DResourceImpl_Release, - /* IWineD3DResource */ - IWineD3DResourceImpl_GetParent, - IWineD3DResourceImpl_GetDevice, - IWineD3DResourceImpl_SetPrivateData, - IWineD3DResourceImpl_GetPrivateData, - IWineD3DResourceImpl_FreePrivateData, - IWineD3DResourceImpl_SetPriority, - IWineD3DResourceImpl_GetPriority, - IWineD3DResourceImpl_PreLoad, - IWineD3DResourceImpl_UnLoad, - IWineD3DResourceImpl_GetType -};