From 92b93172df5255af90646d56c2ca0c82aef41e70 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Mon, 1 Dec 2008 15:32:15 +0100 Subject: [PATCH] wined3d: Remove some unused code. --- dlls/wined3d/basetexture.c | 109 --------------------------------- dlls/wined3d/device.c | 6 -- dlls/wined3d/indexbuffer.c | 2 +- dlls/wined3d/resource.c | 56 +---------------- dlls/wined3d/swapchain_gdi.c | 12 ---- dlls/wined3d/vertexbuffer.c | 4 -- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 40 ++---------- 8 files changed, 8 insertions(+), 223 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 5f7d7c47408..cf2130d4c68 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -27,45 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info -/* ******************************************* - IWineD3DBaseTexture IUnknown parts follow - ******************************************* */ -HRESULT WINAPI IWineD3DBaseTextureImpl_QueryInterface(IWineD3DBaseTexture *iface, REFIID riid, LPVOID *ppobj) -{ - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IWineD3DBase) - || IsEqualGUID(riid, &IID_IWineD3DResource) - || IsEqualGUID(riid, &IID_IWineD3DBaseTexture)) { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } - *ppobj = NULL; - return E_NOINTERFACE; -} - -ULONG WINAPI IWineD3DBaseTextureImpl_AddRef(IWineD3DBaseTexture *iface) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - ULONG ref = InterlockedIncrement(&This->resource.ref); - - TRACE("(%p) : AddRef increasing from %d\n", This,ref - 1); - return ref; -} - -ULONG WINAPI IWineD3DBaseTextureImpl_Release(IWineD3DBaseTexture *iface) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - ULONG ref = InterlockedDecrement(&This->resource.ref); - TRACE("(%p) : Releasing from %d\n", This, ref + 1); - if (ref == 0) { - IWineD3DBaseTextureImpl_CleanUp(iface); - HeapFree(GetProcessHeap(), 0, This); - } - return ref; -} - -/* class static */ void IWineD3DBaseTextureImpl_CleanUp(IWineD3DBaseTexture *iface) { IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; @@ -81,37 +42,6 @@ void IWineD3DBaseTextureImpl_CleanUp(IWineD3DBaseTexture *iface) { IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface); } -/* **************************************************** - IWineD3DBaseTexture IWineD3DResource parts follow - **************************************************** */ -HRESULT WINAPI IWineD3DBaseTextureImpl_GetDevice(IWineD3DBaseTexture *iface, IWineD3DDevice** ppDevice) { - return IWineD3DResourceImpl_GetDevice((IWineD3DResource *)iface, ppDevice); -} - -HRESULT WINAPI IWineD3DBaseTextureImpl_SetPrivateData(IWineD3DBaseTexture *iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - return IWineD3DResourceImpl_SetPrivateData((IWineD3DResource *)iface, refguid, pData, SizeOfData, Flags); -} - -HRESULT WINAPI IWineD3DBaseTextureImpl_GetPrivateData(IWineD3DBaseTexture *iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - return IWineD3DResourceImpl_GetPrivateData((IWineD3DResource *)iface, refguid, pData, pSizeOfData); -} - -HRESULT WINAPI IWineD3DBaseTextureImpl_FreePrivateData(IWineD3DBaseTexture *iface, REFGUID refguid) { - return IWineD3DResourceImpl_FreePrivateData((IWineD3DResource *)iface, refguid); -} - -DWORD WINAPI IWineD3DBaseTextureImpl_SetPriority(IWineD3DBaseTexture *iface, DWORD PriorityNew) { - return IWineD3DResourceImpl_SetPriority((IWineD3DResource *)iface, PriorityNew); -} - -DWORD WINAPI IWineD3DBaseTextureImpl_GetPriority(IWineD3DBaseTexture *iface) { - return IWineD3DResourceImpl_GetPriority((IWineD3DResource *)iface); -} - -void WINAPI IWineD3DBaseTextureImpl_PreLoad(IWineD3DBaseTexture *iface) { - IWineD3DResourceImpl_PreLoad((IWineD3DResource *)iface); -} - void WINAPI IWineD3DBaseTextureImpl_UnLoad(IWineD3DBaseTexture *iface) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; @@ -126,18 +56,6 @@ void WINAPI IWineD3DBaseTextureImpl_UnLoad(IWineD3DBaseTexture *iface This->baseTexture.dirty = TRUE; } -WINED3DRESOURCETYPE WINAPI IWineD3DBaseTextureImpl_GetType(IWineD3DBaseTexture *iface) { - return IWineD3DResourceImpl_GetType((IWineD3DResource *)iface); -} - -HRESULT WINAPI IWineD3DBaseTextureImpl_GetParent(IWineD3DBaseTexture *iface, IUnknown **pParent) { - return IWineD3DResourceImpl_GetParent((IWineD3DResource *)iface, pParent); -} - -/* ****************************************************** - IWineD3DBaseTexture IWineD3DBaseTexture parts follow - ****************************************************** */ - /* There is no OpenGL equivalent of setLOD, getLOD. All they do anyway is prioritize texture loading * so just pretend that they work unless something really needs a failure. */ DWORD WINAPI IWineD3DBaseTextureImpl_SetLOD(IWineD3DBaseTexture *iface, DWORD LODNew) { @@ -232,7 +150,6 @@ void WINAPI IWineD3DBaseTextureImpl_GenerateMipSubLevels(IWineD3DBaseTexture *if return ; } -/* Internal function, No d3d mapping */ BOOL WINAPI IWineD3DBaseTextureImpl_SetDirty(IWineD3DBaseTexture *iface, BOOL dirty) { BOOL old; IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; @@ -330,32 +247,6 @@ HRESULT WINAPI IWineD3DBaseTextureImpl_BindTexture(IWineD3DBaseTexture *iface) { return hr; } -UINT WINAPI IWineD3DBaseTextureImpl_GetTextureDimensions(IWineD3DBaseTexture *iface){ - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - FIXME("(%p) : This shouldn't be called\n", This); - return WINED3D_OK; -} - -BOOL WINAPI IWineD3DBaseTextureImpl_IsCondNP2(IWineD3DBaseTexture *iface){ - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - FIXME("(%p) : This shouldn't be called\n", This); - return FALSE; -} - -static inline GLenum warpLookupType(WINED3DSAMPLERSTATETYPE Type) { - switch(Type) { - case WINED3DSAMP_ADDRESSU: - return GL_TEXTURE_WRAP_S; - case WINED3DSAMP_ADDRESSV: - return GL_TEXTURE_WRAP_T; - case WINED3DSAMP_ADDRESSW: - return GL_TEXTURE_WRAP_R; - default: - FIXME("Unexpected warp type %d\n", Type); - return 0; - } -} - static inline void apply_wrap(const GLint textureDimensions, const DWORD state, const GLint type, BOOL cond_np2) { GLint wrapParm; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7c7f6444eb2..d9fda6e4ddd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -932,10 +932,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa TRACE("(%p) : W(%d) H(%d) D(%d), Lvl(%d) Usage(%d), Fmt(%u,%s), Pool(%s)\n", This, Width, Height, Depth, Levels, Usage, Format, debug_d3dformat(Format), debug_d3dpool(Pool)); - object->width = Width; - object->height = Height; - object->depth = Depth; - /* Is NP2 support for volumes needed? */ object->baseTexture.pow2Matrix[ 0] = 1.0; object->baseTexture.pow2Matrix[ 5] = 1.0; @@ -1081,8 +1077,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface pow2EdgeLength = 1; while (pow2EdgeLength < EdgeLength) pow2EdgeLength <<= 1; - object->edgeLength = EdgeLength; - if (GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO)) { /* Precalculated scaling for 'faked' non power of two texture coords */ object->baseTexture.pow2Matrix[ 0] = 1.0; diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c index 79423a197e0..8d96a083792 100644 --- a/dlls/wined3d/indexbuffer.c +++ b/dlls/wined3d/indexbuffer.c @@ -108,7 +108,7 @@ static DWORD WINAPI IWineD3DIndexBufferImpl_GetPriority(IWineD3DIndexBuffer *ifa } static void WINAPI IWineD3DIndexBufferImpl_PreLoad(IWineD3DIndexBuffer *iface) { - IWineD3DResourceImpl_PreLoad((IWineD3DResource *)iface); + FIXME("iface %p stub!\n", iface); } static void WINAPI IWineD3DIndexBufferImpl_UnLoad(IWineD3DIndexBuffer *iface) { diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index a642fa5fa14..5b0c71b372d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -27,41 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION ((IWineD3DImpl *)(((IWineD3DDeviceImpl *)This->resource.wineD3DDevice)->wineD3D))->gl_info -/* IWineD3DResource IUnknown parts follow: */ -HRESULT WINAPI IWineD3DResourceImpl_QueryInterface(IWineD3DResource *iface, REFIID riid, LPVOID *ppobj) -{ - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IWineD3DBase) - || IsEqualGUID(riid, &IID_IWineD3DResource)) { - IUnknown_AddRef(iface); - *ppobj = This; - return S_OK; - } - *ppobj = NULL; - return E_NOINTERFACE; -} - -ULONG WINAPI IWineD3DResourceImpl_AddRef(IWineD3DResource *iface) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - ULONG ref = InterlockedIncrement(&This->resource.ref); - TRACE("(%p) : AddRef increasing from %d\n", This, ref - 1); - return ref; -} - -ULONG WINAPI IWineD3DResourceImpl_Release(IWineD3DResource *iface) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - ULONG ref = InterlockedDecrement(&This->resource.ref); - TRACE("(%p) : Releasing from %d\n", This, ref + 1); - if (ref == 0) { - IWineD3DResourceImpl_CleanUp(iface); - HeapFree(GetProcessHeap(), 0, This); - } - return ref; -} - -/* class static (not in vtable) */ void IWineD3DResourceImpl_CleanUp(IWineD3DResource *iface){ IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; struct list *e1, *e2; @@ -132,9 +97,7 @@ HRESULT WINAPI IWineD3DResourceImpl_SetPrivateData(IWineD3DResource *iface, REFG data->tag = *refguid; data->flags = Flags; -#if 0 - (*data)->uniquenessValue = This->uniquenessValue; -#endif + if (Flags & WINED3DSPD_IUNKNOWN) { if(SizeOfData != sizeof(IUnknown *)) { WARN("IUnknown data with size %d, returning WINED3DERR_INVALIDCALL\n", SizeOfData); @@ -168,12 +131,6 @@ HRESULT WINAPI IWineD3DResourceImpl_GetPrivateData(IWineD3DResource *iface, REFG data = IWineD3DResourceImpl_FindPrivateData(This, refguid); if (data == NULL) return WINED3DERR_NOTFOUND; - -#if 0 /* This may not be right. */ - if (((*data)->flags & WINED3DSPD_VOLATILE) - && (*data)->uniquenessValue != This->uniquenessValue) - return DDERR_EXPIRED; -#endif if (*pSizeOfData < data->size) { *pSizeOfData = data->size; return WINED3DERR_MOREDATA; @@ -231,17 +188,6 @@ DWORD WINAPI IWineD3DResourceImpl_GetPriority(IWineD3DResource *iface) return This->resource.priority; } -/* Preloading of resources is not supported yet */ -void WINAPI IWineD3DResourceImpl_PreLoad(IWineD3DResource *iface) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - FIXME("(%p) : stub\n", This); -} - -void WINAPI IWineD3DResourceImpl_UnLoad(IWineD3DResource *iface) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - FIXME("(%p) : stub\n", This); -} - WINED3DRESOURCETYPE WINAPI IWineD3DResourceImpl_GetType(IWineD3DResource *iface) { IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; TRACE("(%p) : returning %d\n", This, This->resource.resourceType); diff --git a/dlls/wined3d/swapchain_gdi.c b/dlls/wined3d/swapchain_gdi.c index 63bbf606f8a..6bf1c617057 100644 --- a/dlls/wined3d/swapchain_gdi.c +++ b/dlls/wined3d/swapchain_gdi.c @@ -239,18 +239,6 @@ static HRESULT WINAPI IWineGDISwapChainImpl_Present(IWineD3DSwapChain *iface, CO return WINED3D_OK; } -/* FIXME: This should not be needed, the base version is OK */ -HRESULT WINAPI IWineGDIBaseSwapChainImpl_GetDisplayMode(IWineD3DSwapChain *iface, WINED3DDISPLAYMODE*pMode) { - IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; - IWineD3DDeviceImpl *device = This->wineD3DDevice; - - pMode->Width = device->ddraw_width; - pMode->Height = device->ddraw_height; - pMode->Format = device->ddraw_format; - pMode->RefreshRate = 0; - return WINED3D_OK; -} - const IWineD3DSwapChainVtbl IWineGDISwapChain_Vtbl = { /* IUnknown */ diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 1ce6e8dd043..72019342ac9 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -816,7 +816,3 @@ const BYTE* IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWOR return (const BYTE *)iOffset; } } - -HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface) { - return WINED3D_OK; -} diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 8faef0ca8fb..77ba948784b 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -132,7 +132,7 @@ static DWORD WINAPI IWineD3DVolumeImpl_GetPriority(IWineD3DVolume *iface) { } static void WINAPI IWineD3DVolumeImpl_PreLoad(IWineD3DVolume *iface) { - IWineD3DResourceImpl_PreLoad((IWineD3DResource *)iface); + FIXME("iface %p stub!\n", iface); } static void WINAPI IWineD3DVolumeImpl_UnLoad(IWineD3DVolume *iface) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2c3d7e004b9..877601c46f6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1078,7 +1078,6 @@ typedef struct PrivateData GUID tag; DWORD flags; /* DDSPD_* */ - DWORD uniqueness_value; union { @@ -1278,8 +1277,6 @@ typedef struct IWineD3DCubeTextureImpl /* IWineD3DCubeTexture */ IWineD3DSurface *surfaces[6][MAX_LEVELS]; - - UINT edgeLength; } IWineD3DCubeTextureImpl; extern const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl; @@ -1328,10 +1325,6 @@ typedef struct IWineD3DVolumeTextureImpl /* IWineD3DVolumeTexture */ IWineD3DVolume *volumes[MAX_LEVELS]; - - UINT width; - UINT height; - UINT depth; } IWineD3DVolumeTextureImpl; extern const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl; @@ -1938,11 +1931,7 @@ unsigned int count_bits(unsigned int mask); * * Note: Only require classes which are subclassed, ie resource, basetexture, */ - /*** IUnknown methods ***/ - extern HRESULT WINAPI IWineD3DResourceImpl_QueryInterface(IWineD3DResource *iface, REFIID riid, void** ppvObject); - extern ULONG WINAPI IWineD3DResourceImpl_AddRef(IWineD3DResource *iface); - extern ULONG WINAPI IWineD3DResourceImpl_Release(IWineD3DResource *iface); - /*** IWineD3DResource methods ***/ + /* IWineD3DResource */ extern HRESULT WINAPI IWineD3DResourceImpl_GetParent(IWineD3DResource *iface, IUnknown **pParent); extern HRESULT WINAPI IWineD3DResourceImpl_GetDevice(IWineD3DResource *iface, IWineD3DDevice ** ppDevice); extern HRESULT WINAPI IWineD3DResourceImpl_SetPrivateData(IWineD3DResource *iface, REFGUID refguid, CONST void * pData, DWORD SizeOfData, DWORD Flags); @@ -1950,28 +1939,12 @@ unsigned int count_bits(unsigned int mask); extern HRESULT WINAPI IWineD3DResourceImpl_FreePrivateData(IWineD3DResource *iface, REFGUID refguid); extern DWORD WINAPI IWineD3DResourceImpl_SetPriority(IWineD3DResource *iface, DWORD PriorityNew); extern DWORD WINAPI IWineD3DResourceImpl_GetPriority(IWineD3DResource *iface); - extern void WINAPI IWineD3DResourceImpl_PreLoad(IWineD3DResource *iface); - extern void WINAPI IWineD3DResourceImpl_UnLoad(IWineD3DResource *iface); extern WINED3DRESOURCETYPE WINAPI IWineD3DResourceImpl_GetType(IWineD3DResource *iface); - /*** class static members ***/ void IWineD3DResourceImpl_CleanUp(IWineD3DResource *iface); - /*** IUnknown methods ***/ - extern HRESULT WINAPI IWineD3DBaseTextureImpl_QueryInterface(IWineD3DBaseTexture *iface, REFIID riid, void** ppvObject); - extern ULONG WINAPI IWineD3DBaseTextureImpl_AddRef(IWineD3DBaseTexture *iface); - extern ULONG WINAPI IWineD3DBaseTextureImpl_Release(IWineD3DBaseTexture *iface); - /*** IWineD3DResource methods ***/ - extern HRESULT WINAPI IWineD3DBaseTextureImpl_GetParent(IWineD3DBaseTexture *iface, IUnknown **pParent); - extern HRESULT WINAPI IWineD3DBaseTextureImpl_GetDevice(IWineD3DBaseTexture *iface, IWineD3DDevice ** ppDevice); - extern HRESULT WINAPI IWineD3DBaseTextureImpl_SetPrivateData(IWineD3DBaseTexture *iface, REFGUID refguid, CONST void * pData, DWORD SizeOfData, DWORD Flags); - extern HRESULT WINAPI IWineD3DBaseTextureImpl_GetPrivateData(IWineD3DBaseTexture *iface, REFGUID refguid, void * pData, DWORD * pSizeOfData); - extern HRESULT WINAPI IWineD3DBaseTextureImpl_FreePrivateData(IWineD3DBaseTexture *iface, REFGUID refguid); - extern DWORD WINAPI IWineD3DBaseTextureImpl_SetPriority(IWineD3DBaseTexture *iface, DWORD PriorityNew); - extern DWORD WINAPI IWineD3DBaseTextureImpl_GetPriority(IWineD3DBaseTexture *iface); - extern void WINAPI IWineD3DBaseTextureImpl_PreLoad(IWineD3DBaseTexture *iface); + /* IWineD3DBaseTexture */ + void IWineD3DBaseTextureImpl_CleanUp(IWineD3DBaseTexture *iface); extern void WINAPI IWineD3DBaseTextureImpl_UnLoad(IWineD3DBaseTexture *iface); - extern WINED3DRESOURCETYPE WINAPI IWineD3DBaseTextureImpl_GetType(IWineD3DBaseTexture *iface); - /*** IWineD3DBaseTexture methods ***/ extern DWORD WINAPI IWineD3DBaseTextureImpl_SetLOD(IWineD3DBaseTexture *iface, DWORD LODNew); extern DWORD WINAPI IWineD3DBaseTextureImpl_GetLOD(IWineD3DBaseTexture *iface); extern DWORD WINAPI IWineD3DBaseTextureImpl_GetLevelCount(IWineD3DBaseTexture *iface); @@ -1980,14 +1953,11 @@ unsigned int count_bits(unsigned int mask); extern void WINAPI IWineD3DBaseTextureImpl_GenerateMipSubLevels(IWineD3DBaseTexture *iface); extern BOOL WINAPI IWineD3DBaseTextureImpl_SetDirty(IWineD3DBaseTexture *iface, BOOL); extern BOOL WINAPI IWineD3DBaseTextureImpl_GetDirty(IWineD3DBaseTexture *iface); - - extern const BYTE *IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD iOffset, GLint *vbo); - extern HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface); extern HRESULT WINAPI IWineD3DBaseTextureImpl_BindTexture(IWineD3DBaseTexture *iface); extern void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface, const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]); - /*** class static members ***/ - void IWineD3DBaseTextureImpl_CleanUp(IWineD3DBaseTexture *iface); + /* IWineD3DVertexBuffer */ + extern const BYTE *IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD iOffset, GLint *vbo); /* TODO: Make this dynamic, based on shader limits ? */ #define MAX_REG_ADDR 1