[PATCH] WineD3D: Remove BaseTexture::UnBindTexture=0A=
Stefan Doesinger
stefan at codeweavers.com
Thu Aug 21 13:31:39 CDT 2008
=0A=
It contains junky code and is not called by anything=0A=
---=0A=
dlls/wined3d/basetexture.c | 21 ---------------------=0A=
dlls/wined3d/cubetexture.c | 7 -------=0A=
dlls/wined3d/texture.c | 7 -------=0A=
dlls/wined3d/volumetexture.c | 7 -------=0A=
dlls/wined3d/wined3d_private.h | 1 -=0A=
include/wine/wined3d_interface.h | 8 --------=0A=
6 files changed, 0 insertions(+), 51 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c=0A=
index d402586..26940f4 100644=0A=
--- a/dlls/wined3d/basetexture.c=0A=
+++ b/dlls/wined3d/basetexture.c=0A=
@@ -330,26 +330,6 @@ HRESULT WINAPI =
IWineD3DBaseTextureImpl_BindTexture(IWineD3DBaseTexture *iface) {=0A=
return hr;=0A=
}=0A=
=0A=
-HRESULT WINAPI =
IWineD3DBaseTextureImpl_UnBindTexture(IWineD3DBaseTexture *iface) {=0A=
- IWineD3DBaseTextureImpl *This =3D (IWineD3DBaseTextureImpl *)iface;=0A=
- UINT textureDimensions;=0A=
-=0A=
- TRACE("(%p) : About to bind texture\n", This);=0A=
- textureDimensions =3D =
IWineD3DBaseTexture_GetTextureDimensions(iface);=0A=
-=0A=
- ENTER_GL();=0A=
-=0A=
- glBindTexture(textureDimensions, 0);=0A=
-#if 0 /* TODO: context manager support */=0A=
- IWineD3DContextManager_PopState(This->contextManager, =
textureDimensions, ENABLED, NOW /* make sure the state is applied now =
*/);=0A=
-#else=0A=
- glDisable(textureDimensions);=0A=
-#endif=0A=
-=0A=
- LEAVE_GL();=0A=
- return WINED3D_OK;=0A=
-}=0A=
-=0A=
UINT WINAPI =
IWineD3DBaseTextureImpl_GetTextureDimensions(IWineD3DBaseTexture *iface){=0A=
IWineD3DBaseTextureImpl *This =3D (IWineD3DBaseTextureImpl *)iface;=0A=
FIXME("(%p) : This shouldn't be called\n", This);=0A=
@@ -537,7 +517,6 @@ static const IWineD3DBaseTextureVtbl =
IWineD3DBaseTexture_Vtbl =3D=0A=
IWineD3DBaseTextureImpl_GetDirty,=0A=
/* internal */=0A=
IWineD3DBaseTextureImpl_BindTexture,=0A=
- IWineD3DBaseTextureImpl_UnBindTexture,=0A=
IWineD3DBaseTextureImpl_GetTextureDimensions,=0A=
IWineD3DBaseTextureImpl_IsCondNP2,=0A=
IWineD3DBaseTextureImpl_ApplyStateChanges=0A=
diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c=0A=
index 39026df..14d3040 100644=0A=
--- a/dlls/wined3d/cubetexture.c=0A=
+++ b/dlls/wined3d/cubetexture.c=0A=
@@ -254,12 +254,6 @@ static HRESULT WINAPI =
IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *i=0A=
return hr;=0A=
}=0A=
=0A=
-static HRESULT WINAPI =
IWineD3DCubeTextureImpl_UnBindTexture(IWineD3DCubeTexture *iface) {=0A=
- IWineD3DCubeTextureImpl *This =3D (IWineD3DCubeTextureImpl *)iface;=0A=
- TRACE("(%p) : relay to BaseTexture\n", This);=0A=
- return IWineD3DBaseTextureImpl_UnBindTexture((IWineD3DBaseTexture =
*)iface);=0A=
-}=0A=
-=0A=
static UINT WINAPI =
IWineD3DCubeTextureImpl_GetTextureDimensions(IWineD3DCubeTexture *iface){=0A=
IWineD3DCubeTextureImpl *This =3D (IWineD3DCubeTextureImpl *)iface;=0A=
TRACE("(%p)\n", This);=0A=
@@ -409,7 +403,6 @@ const IWineD3DCubeTextureVtbl =
IWineD3DCubeTexture_Vtbl =3D=0A=
IWineD3DCubeTextureImpl_SetDirty,=0A=
IWineD3DCubeTextureImpl_GetDirty,=0A=
IWineD3DCubeTextureImpl_BindTexture,=0A=
- IWineD3DCubeTextureImpl_UnBindTexture,=0A=
IWineD3DCubeTextureImpl_GetTextureDimensions,=0A=
IWineD3DCubeTextureImpl_IsCondNP2,=0A=
IWineD3DCubeTextureImpl_ApplyStateChanges,=0A=
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c=0A=
index bd83541..4a4893e 100644=0A=
--- a/dlls/wined3d/texture.c=0A=
+++ b/dlls/wined3d/texture.c=0A=
@@ -254,12 +254,6 @@ static HRESULT WINAPI =
IWineD3DTextureImpl_BindTexture(IWineD3DTexture *iface) {=0A=
return hr;=0A=
}=0A=
=0A=
-static HRESULT WINAPI IWineD3DTextureImpl_UnBindTexture(IWineD3DTexture =
*iface) {=0A=
- IWineD3DTextureImpl *This =3D (IWineD3DTextureImpl *)iface;=0A=
- TRACE("(%p) : relay to BaseTexture\n", This);=0A=
- return IWineD3DBaseTextureImpl_UnBindTexture((IWineD3DBaseTexture =
*)iface);=0A=
-}=0A=
-=0A=
static UINT WINAPI =
IWineD3DTextureImpl_GetTextureDimensions(IWineD3DTexture *iface) {=0A=
IWineD3DTextureImpl *This =3D (IWineD3DTextureImpl *)iface;=0A=
TRACE("(%p)\n", This);=0A=
@@ -397,7 +391,6 @@ const IWineD3DTextureVtbl IWineD3DTexture_Vtbl =3D=0A=
IWineD3DTextureImpl_SetDirty,=0A=
IWineD3DTextureImpl_GetDirty,=0A=
IWineD3DTextureImpl_BindTexture,=0A=
- IWineD3DTextureImpl_UnBindTexture,=0A=
IWineD3DTextureImpl_GetTextureDimensions,=0A=
IWineD3DTextureImpl_IsCondNP2,=0A=
IWineD3DTextureImpl_ApplyStateChanges,=0A=
diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c=0A=
index de0bba7..2a0356d 100644=0A=
--- a/dlls/wined3d/volumetexture.c=0A=
+++ b/dlls/wined3d/volumetexture.c=0A=
@@ -201,12 +201,6 @@ static HRESULT WINAPI =
IWineD3DVolumeTextureImpl_BindTexture(IWineD3DVolumeTextur=0A=
return IWineD3DBaseTextureImpl_BindTexture((IWineD3DBaseTexture =
*)iface);=0A=
}=0A=
=0A=
-static HRESULT WINAPI =
IWineD3DVolumeTextureImpl_UnBindTexture(IWineD3DVolumeTexture *iface) {=0A=
- IWineD3DVolumeTextureImpl *This =3D (IWineD3DVolumeTextureImpl =
*)iface;=0A=
- TRACE("(%p) : relay to BaseTexture\n", This);=0A=
- return IWineD3DBaseTextureImpl_UnBindTexture((IWineD3DBaseTexture =
*)iface);=0A=
-}=0A=
-=0A=
static UINT WINAPI =
IWineD3DVolumeTextureImpl_GetTextureDimensions(IWineD3DVolumeTexture =
*iface) {=0A=
IWineD3DVolumeTextureImpl *This =3D (IWineD3DVolumeTextureImpl =
*)iface;=0A=
TRACE("(%p)\n", This);=0A=
@@ -335,7 +329,6 @@ const IWineD3DVolumeTextureVtbl =
IWineD3DVolumeTexture_Vtbl =3D=0A=
IWineD3DVolumeTextureImpl_GetDirty,=0A=
/* not in d3d */=0A=
IWineD3DVolumeTextureImpl_BindTexture,=0A=
- IWineD3DVolumeTextureImpl_UnBindTexture,=0A=
IWineD3DVolumeTextureImpl_GetTextureDimensions,=0A=
IWineD3DVolumeTextureImpl_IsCondNP2,=0A=
IWineD3DVolumeTextureImpl_ApplyStateChanges,=0A=
diff --git a/dlls/wined3d/wined3d_private.h =
b/dlls/wined3d/wined3d_private.h=0A=
index fdb56b5..72e9aee 100644=0A=
--- a/dlls/wined3d/wined3d_private.h=0A=
+++ b/dlls/wined3d/wined3d_private.h=0A=
@@ -1885,7 +1885,6 @@ unsigned int count_bits(unsigned int mask);=0A=
extern BYTE* WINAPI =
IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD =
iOffset, GLint *vbo);=0A=
extern HRESULT WINAPI =
IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface);=0A=
extern HRESULT WINAPI =
IWineD3DBaseTextureImpl_BindTexture(IWineD3DBaseTexture *iface);=0A=
- extern HRESULT WINAPI =
IWineD3DBaseTextureImpl_UnBindTexture(IWineD3DBaseTexture *iface);=0A=
extern void WINAPI =
IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface, =
const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], const =
DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]);=0A=
/*** class static members ***/=0A=
void IWineD3DBaseTextureImpl_CleanUp(IWineD3DBaseTexture *iface);=0A=
diff --git a/include/wine/wined3d_interface.h =
b/include/wine/wined3d_interface.h=0A=
index d2c8a2c..4b960d5 100644=0A=
--- a/include/wine/wined3d_interface.h=0A=
+++ b/include/wine/wined3d_interface.h=0A=
@@ -810,7 +810,6 @@ =
DECLARE_INTERFACE_(IWineD3DBaseTexture,IWineD3DResource)=0A=
STDMETHOD_(BOOL, SetDirty)(THIS_ BOOL) PURE;=0A=
STDMETHOD_(BOOL, GetDirty)(THIS) PURE;=0A=
STDMETHOD(BindTexture)(THIS) PURE;=0A=
- STDMETHOD(UnBindTexture)(THIS) PURE;=0A=
STDMETHOD_(UINT, GetTextureDimensions)(THIS) PURE;=0A=
STDMETHOD_(BOOL, IsCondNP2)(THIS) PURE;=0A=
STDMETHOD_(void, ApplyStateChanges)(THIS_ const DWORD =
textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], const DWORD =
samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) PURE;=0A=
@@ -846,7 +845,6 @@ =
DECLARE_INTERFACE_(IWineD3DBaseTexture,IWineD3DResource)=0A=
#define IWineD3DBaseTexture_GetDirty(p) =
(p)->lpVtbl->GetDirty(p)=0A=
/*** internal methods ***/=0A=
#define IWineD3DBaseTexture_BindTexture(p) =
(p)->lpVtbl->BindTexture(p)=0A=
-#define IWineD3DBaseTexture_UnBindTexture(p) =
(p)->lpVtbl->UnBindTexture(p)=0A=
#define IWineD3DBaseTexture_GetTextureDimensions(p) =
(p)->lpVtbl->GetTextureDimensions(p)=0A=
#define IWineD3DBaseTexture_IsCondNP2(p) =
(p)->lpVtbl->IsCondNP2(p)=0A=
#define IWineD3DBaseTexture_ApplyStateChanges(p,a,b) =
(p)->lpVtbl->ApplyStateChanges(p,a,b)=0A=
@@ -884,7 +882,6 @@ =
DECLARE_INTERFACE_(IWineD3DTexture,IWineD3DBaseTexture)=0A=
STDMETHOD_(BOOL, SetDirty)(THIS_ BOOL) PURE;=0A=
STDMETHOD_(BOOL, GetDirty)(THIS) PURE;=0A=
STDMETHOD(BindTexture)(THIS) PURE;=0A=
- STDMETHOD(UnBindTexture)(THIS) PURE;=0A=
STDMETHOD_(UINT, GetTextureDimensions)(THIS) PURE;=0A=
STDMETHOD_(BOOL, IsCondNP2)(THIS) PURE;=0A=
STDMETHOD_(void, ApplyStateChanges)(THIS_ const DWORD =
textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], const DWORD =
samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) PURE;=0A=
@@ -925,7 +922,6 @@ =
DECLARE_INTERFACE_(IWineD3DTexture,IWineD3DBaseTexture)=0A=
#define IWineD3DTexture_SetDirty(p,a) =
(p)->lpVtbl->SetDirty(p,a)=0A=
#define IWineD3DTexture_GetDirty(p) =
(p)->lpVtbl->GetDirty(p)=0A=
#define IWineD3DTexture_BindTexture(p) =
(p)->lpVtbl->BindTexture(p)=0A=
-#define IWineD3DTexture_UnBindTexture(p) =
(p)->lpVtbl->UnBindTexture(p)=0A=
#define IWineD3DTexture_GetTextureDimensions(p) =
(p)->lpVtbl->GetTextureDimensions(p)=0A=
#define IWineD3DTexture_IsCondNP2(p) =
(p)->lpVtbl->IsCondNP2(p)=0A=
#define IWineD3DTexture_ApplyStateChanges(p,a,b) =
(p)->lpVtbl->ApplyStateChanges(p,a,b)=0A=
@@ -970,7 +966,6 @@ =
DECLARE_INTERFACE_(IWineD3DCubeTexture,IWineD3DBaseTexture)=0A=
STDMETHOD_(BOOL, SetDirty)(THIS_ BOOL) PURE;=0A=
STDMETHOD_(BOOL, GetDirty)(THIS) PURE;=0A=
STDMETHOD(BindTexture)(THIS) PURE;=0A=
- STDMETHOD(UnBindTexture)(THIS) PURE;=0A=
STDMETHOD_(UINT, GetTextureDimensions)(THIS) PURE;=0A=
STDMETHOD_(BOOL, IsCondNP2)(THIS) PURE;=0A=
STDMETHOD_(void, ApplyStateChanges)(THIS_ DWORD const =
textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], const DWORD =
samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) PURE;=0A=
@@ -1011,7 +1006,6 @@ =
DECLARE_INTERFACE_(IWineD3DCubeTexture,IWineD3DBaseTexture)=0A=
#define IWineD3DCubeTexture_SetDirty(p,a) =
(p)->lpVtbl->SetDirty(p,a)=0A=
#define IWineD3DCubeTexture_GetDirty(p) =
(p)->lpVtbl->GetDirty(p)=0A=
#define IWineD3DCubeTexture_BindTexture(p) =
(p)->lpVtbl->BindTexture(p)=0A=
-#define IWineD3DCubeTexture_UnBindTexture(p) =
(p)->lpVtbl->UnBindTexture(p)=0A=
#define IWineD3DCubeTexture_GetTextureDimensions(p) =
(p)->lpVtbl->GetTextureDimensions(p)=0A=
#define IWineD3DCubeTexture_IsCondNP2(p) =
(p)->lpVtbl->IsCondNP2(p)=0A=
#define IWineD3DCubeTexture_ApplyStateChanges(p,a,b) =
(p)->lpVtbl->ApplyStateChanges(p,a,b)=0A=
@@ -1057,7 +1051,6 @@ =
DECLARE_INTERFACE_(IWineD3DVolumeTexture,IWineD3DBaseTexture)=0A=
STDMETHOD_(BOOL, SetDirty)(THIS_ BOOL) PURE;=0A=
STDMETHOD_(BOOL, GetDirty)(THIS) PURE;=0A=
STDMETHOD(BindTexture)(THIS) PURE;=0A=
- STDMETHOD(UnBindTexture)(THIS) PURE;=0A=
STDMETHOD_(UINT, GetTextureDimensions)(THIS) PURE;=0A=
STDMETHOD_(BOOL, IsCondNP2)(THIS) PURE;=0A=
STDMETHOD_(void, ApplyStateChanges)(THIS_ const DWORD =
textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], const DWORD =
samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) PURE;=0A=
@@ -1098,7 +1091,6 @@ =
DECLARE_INTERFACE_(IWineD3DVolumeTexture,IWineD3DBaseTexture)=0A=
#define IWineD3DVolumeTexture_SetDirty(p,a) =
(p)->lpVtbl->SetDirty(p,a)=0A=
#define IWineD3DVolumeTexture_GetDirty(p) =
(p)->lpVtbl->GetDirty(p)=0A=
#define IWineD3DVolumeTexture_BindTexture(p) =
(p)->lpVtbl->BindTexture(p)=0A=
-#define IWineD3DVolumeTexture_UnBindTexture(p) =
(p)->lpVtbl->UnBindTexture(p)=0A=
#define IWineD3DVolumeTexture_GetTextureDimensions(p) =
(p)->lpVtbl->GetTextureDimensions(p)=0A=
#define IWineD3DVolumeTexture_IsCondNP2(p) =
(p)->lpVtbl->IsCondNP2(p)=0A=
#define IWineD3DVolumeTexture_ApplyStateChanges(p,a,b) =
(p)->lpVtbl->ApplyStateChanges(p,a,b)=0A=
-- =0A=
1.5.6.4=0A=
=0A=
------=_NextPart_000_0005_01C90844.040E3C90--
More information about the wine-patches
mailing list