From 750973cec5140cad410b8f5ab4341e151a000e1b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20D=C3=B6singer?= Date: Thu, 21 Aug 2008 13:31:39 -0500 Subject: [PATCH] wined3d: Remove BaseTexture::UnBindTexture. --- dlls/wined3d/basetexture.c | 21 --------------------- dlls/wined3d/cubetexture.c | 7 ------- dlls/wined3d/texture.c | 7 ------- dlls/wined3d/volumetexture.c | 7 ------- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d_interface.h | 8 -------- 6 files changed, 51 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index d4025866e7a..26940f4340b 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -330,26 +330,6 @@ HRESULT WINAPI IWineD3DBaseTextureImpl_BindTexture(IWineD3DBaseTexture *iface) { return hr; } -HRESULT WINAPI IWineD3DBaseTextureImpl_UnBindTexture(IWineD3DBaseTexture *iface) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - UINT textureDimensions; - - TRACE("(%p) : About to bind texture\n", This); - textureDimensions = IWineD3DBaseTexture_GetTextureDimensions(iface); - - ENTER_GL(); - - glBindTexture(textureDimensions, 0); -#if 0 /* TODO: context manager support */ - IWineD3DContextManager_PopState(This->contextManager, textureDimensions, ENABLED, NOW /* make sure the state is applied now */); -#else - glDisable(textureDimensions); -#endif - - LEAVE_GL(); - return WINED3D_OK; -} - UINT WINAPI IWineD3DBaseTextureImpl_GetTextureDimensions(IWineD3DBaseTexture *iface){ IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; FIXME("(%p) : This shouldn't be called\n", This); @@ -537,7 +517,6 @@ static const IWineD3DBaseTextureVtbl IWineD3DBaseTexture_Vtbl = IWineD3DBaseTextureImpl_GetDirty, /* internal */ IWineD3DBaseTextureImpl_BindTexture, - IWineD3DBaseTextureImpl_UnBindTexture, IWineD3DBaseTextureImpl_GetTextureDimensions, IWineD3DBaseTextureImpl_IsCondNP2, IWineD3DBaseTextureImpl_ApplyStateChanges diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 39026df3b33..14d30404af4 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -254,12 +254,6 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *i return hr; } -static HRESULT WINAPI IWineD3DCubeTextureImpl_UnBindTexture(IWineD3DCubeTexture *iface) { - IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; - TRACE("(%p) : relay to BaseTexture\n", This); - return IWineD3DBaseTextureImpl_UnBindTexture((IWineD3DBaseTexture *)iface); -} - static UINT WINAPI IWineD3DCubeTextureImpl_GetTextureDimensions(IWineD3DCubeTexture *iface){ IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; TRACE("(%p)\n", This); @@ -409,7 +403,6 @@ const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl = IWineD3DCubeTextureImpl_SetDirty, IWineD3DCubeTextureImpl_GetDirty, IWineD3DCubeTextureImpl_BindTexture, - IWineD3DCubeTextureImpl_UnBindTexture, IWineD3DCubeTextureImpl_GetTextureDimensions, IWineD3DCubeTextureImpl_IsCondNP2, IWineD3DCubeTextureImpl_ApplyStateChanges, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index bd83541a523..4a4893ec8e6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -254,12 +254,6 @@ static HRESULT WINAPI IWineD3DTextureImpl_BindTexture(IWineD3DTexture *iface) { return hr; } -static HRESULT WINAPI IWineD3DTextureImpl_UnBindTexture(IWineD3DTexture *iface) { - IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; - TRACE("(%p) : relay to BaseTexture\n", This); - return IWineD3DBaseTextureImpl_UnBindTexture((IWineD3DBaseTexture *)iface); -} - static UINT WINAPI IWineD3DTextureImpl_GetTextureDimensions(IWineD3DTexture *iface) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; TRACE("(%p)\n", This); @@ -397,7 +391,6 @@ const IWineD3DTextureVtbl IWineD3DTexture_Vtbl = IWineD3DTextureImpl_SetDirty, IWineD3DTextureImpl_GetDirty, IWineD3DTextureImpl_BindTexture, - IWineD3DTextureImpl_UnBindTexture, IWineD3DTextureImpl_GetTextureDimensions, IWineD3DTextureImpl_IsCondNP2, IWineD3DTextureImpl_ApplyStateChanges, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index de0bba7883d..2a0356d2e82 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -201,12 +201,6 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_BindTexture(IWineD3DVolumeTextur return IWineD3DBaseTextureImpl_BindTexture((IWineD3DBaseTexture *)iface); } -static HRESULT WINAPI IWineD3DVolumeTextureImpl_UnBindTexture(IWineD3DVolumeTexture *iface) { - IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; - TRACE("(%p) : relay to BaseTexture\n", This); - return IWineD3DBaseTextureImpl_UnBindTexture((IWineD3DBaseTexture *)iface); -} - static UINT WINAPI IWineD3DVolumeTextureImpl_GetTextureDimensions(IWineD3DVolumeTexture *iface) { IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; TRACE("(%p)\n", This); @@ -335,7 +329,6 @@ const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_GetDirty, /* not in d3d */ IWineD3DVolumeTextureImpl_BindTexture, - IWineD3DVolumeTextureImpl_UnBindTexture, IWineD3DVolumeTextureImpl_GetTextureDimensions, IWineD3DVolumeTextureImpl_IsCondNP2, IWineD3DVolumeTextureImpl_ApplyStateChanges, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fdb56b54433..72e9aee0d6b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1885,7 +1885,6 @@ unsigned int count_bits(unsigned int mask); extern BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD iOffset, GLint *vbo); extern HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface); extern HRESULT WINAPI IWineD3DBaseTextureImpl_BindTexture(IWineD3DBaseTexture *iface); - extern HRESULT WINAPI IWineD3DBaseTextureImpl_UnBindTexture(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); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index d2c8a2cf561..4b960d55221 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -810,7 +810,6 @@ DECLARE_INTERFACE_(IWineD3DBaseTexture,IWineD3DResource) STDMETHOD_(BOOL, SetDirty)(THIS_ BOOL) PURE; STDMETHOD_(BOOL, GetDirty)(THIS) PURE; STDMETHOD(BindTexture)(THIS) PURE; - STDMETHOD(UnBindTexture)(THIS) PURE; STDMETHOD_(UINT, GetTextureDimensions)(THIS) PURE; STDMETHOD_(BOOL, IsCondNP2)(THIS) PURE; STDMETHOD_(void, ApplyStateChanges)(THIS_ const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) PURE; @@ -846,7 +845,6 @@ DECLARE_INTERFACE_(IWineD3DBaseTexture,IWineD3DResource) #define IWineD3DBaseTexture_GetDirty(p) (p)->lpVtbl->GetDirty(p) /*** internal methods ***/ #define IWineD3DBaseTexture_BindTexture(p) (p)->lpVtbl->BindTexture(p) -#define IWineD3DBaseTexture_UnBindTexture(p) (p)->lpVtbl->UnBindTexture(p) #define IWineD3DBaseTexture_GetTextureDimensions(p) (p)->lpVtbl->GetTextureDimensions(p) #define IWineD3DBaseTexture_IsCondNP2(p) (p)->lpVtbl->IsCondNP2(p) #define IWineD3DBaseTexture_ApplyStateChanges(p,a,b) (p)->lpVtbl->ApplyStateChanges(p,a,b) @@ -884,7 +882,6 @@ DECLARE_INTERFACE_(IWineD3DTexture,IWineD3DBaseTexture) STDMETHOD_(BOOL, SetDirty)(THIS_ BOOL) PURE; STDMETHOD_(BOOL, GetDirty)(THIS) PURE; STDMETHOD(BindTexture)(THIS) PURE; - STDMETHOD(UnBindTexture)(THIS) PURE; STDMETHOD_(UINT, GetTextureDimensions)(THIS) PURE; STDMETHOD_(BOOL, IsCondNP2)(THIS) PURE; STDMETHOD_(void, ApplyStateChanges)(THIS_ const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) PURE; @@ -925,7 +922,6 @@ DECLARE_INTERFACE_(IWineD3DTexture,IWineD3DBaseTexture) #define IWineD3DTexture_SetDirty(p,a) (p)->lpVtbl->SetDirty(p,a) #define IWineD3DTexture_GetDirty(p) (p)->lpVtbl->GetDirty(p) #define IWineD3DTexture_BindTexture(p) (p)->lpVtbl->BindTexture(p) -#define IWineD3DTexture_UnBindTexture(p) (p)->lpVtbl->UnBindTexture(p) #define IWineD3DTexture_GetTextureDimensions(p) (p)->lpVtbl->GetTextureDimensions(p) #define IWineD3DTexture_IsCondNP2(p) (p)->lpVtbl->IsCondNP2(p) #define IWineD3DTexture_ApplyStateChanges(p,a,b) (p)->lpVtbl->ApplyStateChanges(p,a,b) @@ -970,7 +966,6 @@ DECLARE_INTERFACE_(IWineD3DCubeTexture,IWineD3DBaseTexture) STDMETHOD_(BOOL, SetDirty)(THIS_ BOOL) PURE; STDMETHOD_(BOOL, GetDirty)(THIS) PURE; STDMETHOD(BindTexture)(THIS) PURE; - STDMETHOD(UnBindTexture)(THIS) PURE; STDMETHOD_(UINT, GetTextureDimensions)(THIS) PURE; STDMETHOD_(BOOL, IsCondNP2)(THIS) PURE; STDMETHOD_(void, ApplyStateChanges)(THIS_ DWORD const textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) PURE; @@ -1011,7 +1006,6 @@ DECLARE_INTERFACE_(IWineD3DCubeTexture,IWineD3DBaseTexture) #define IWineD3DCubeTexture_SetDirty(p,a) (p)->lpVtbl->SetDirty(p,a) #define IWineD3DCubeTexture_GetDirty(p) (p)->lpVtbl->GetDirty(p) #define IWineD3DCubeTexture_BindTexture(p) (p)->lpVtbl->BindTexture(p) -#define IWineD3DCubeTexture_UnBindTexture(p) (p)->lpVtbl->UnBindTexture(p) #define IWineD3DCubeTexture_GetTextureDimensions(p) (p)->lpVtbl->GetTextureDimensions(p) #define IWineD3DCubeTexture_IsCondNP2(p) (p)->lpVtbl->IsCondNP2(p) #define IWineD3DCubeTexture_ApplyStateChanges(p,a,b) (p)->lpVtbl->ApplyStateChanges(p,a,b) @@ -1057,7 +1051,6 @@ DECLARE_INTERFACE_(IWineD3DVolumeTexture,IWineD3DBaseTexture) STDMETHOD_(BOOL, SetDirty)(THIS_ BOOL) PURE; STDMETHOD_(BOOL, GetDirty)(THIS) PURE; STDMETHOD(BindTexture)(THIS) PURE; - STDMETHOD(UnBindTexture)(THIS) PURE; STDMETHOD_(UINT, GetTextureDimensions)(THIS) PURE; STDMETHOD_(BOOL, IsCondNP2)(THIS) PURE; STDMETHOD_(void, ApplyStateChanges)(THIS_ const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) PURE; @@ -1098,7 +1091,6 @@ DECLARE_INTERFACE_(IWineD3DVolumeTexture,IWineD3DBaseTexture) #define IWineD3DVolumeTexture_SetDirty(p,a) (p)->lpVtbl->SetDirty(p,a) #define IWineD3DVolumeTexture_GetDirty(p) (p)->lpVtbl->GetDirty(p) #define IWineD3DVolumeTexture_BindTexture(p) (p)->lpVtbl->BindTexture(p) -#define IWineD3DVolumeTexture_UnBindTexture(p) (p)->lpVtbl->UnBindTexture(p) #define IWineD3DVolumeTexture_GetTextureDimensions(p) (p)->lpVtbl->GetTextureDimensions(p) #define IWineD3DVolumeTexture_IsCondNP2(p) (p)->lpVtbl->IsCondNP2(p) #define IWineD3DVolumeTexture_ApplyStateChanges(p,a,b) (p)->lpVtbl->ApplyStateChanges(p,a,b) -- 2.11.4.GIT