Henri Verbeet : wined3d: Remove the unused IWineD3DBaseTexture::GetDirty() method.
Alexandre Julliard
julliard at winehq.org
Thu Dec 9 12:26:23 CST 2010
Module: wine
Branch: master
Commit: 4dd3066ea3f96ab25ff86ebf3c54c489a88c551e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dd3066ea3f96ab25ff86ebf3c54c489a88c551e
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Dec 8 18:28:08 2010 +0100
wined3d: Remove the unused IWineD3DBaseTexture::GetDirty() method.
---
dlls/wined3d/basetexture.c | 6 ------
dlls/wined3d/cubetexture.c | 6 ------
dlls/wined3d/texture.c | 5 -----
dlls/wined3d/volumetexture.c | 5 -----
dlls/wined3d/wined3d_private.h | 1 -
include/wine/wined3d.idl | 2 --
6 files changed, 0 insertions(+), 25 deletions(-)
diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c
index 83f3797..166584d 100644
--- a/dlls/wined3d/basetexture.c
+++ b/dlls/wined3d/basetexture.c
@@ -247,12 +247,6 @@ BOOL basetexture_set_dirty(IWineD3DBaseTexture *iface, BOOL dirty)
return old;
}
-BOOL basetexture_get_dirty(IWineD3DBaseTexture *iface)
-{
- IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface;
- return This->baseTexture.texture_rgb.dirty || This->baseTexture.texture_srgb.dirty;
-}
-
/* Context activation is done by the caller. */
HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc)
{
diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c
index d53f6cf..d2f2f19 100644
--- a/dlls/wined3d/cubetexture.c
+++ b/dlls/wined3d/cubetexture.c
@@ -275,11 +275,6 @@ static BOOL WINAPI IWineD3DCubeTextureImpl_SetDirty(IWineD3DCubeTexture *iface,
return basetexture_set_dirty((IWineD3DBaseTexture *)iface, dirty);
}
-/* Internal function, No d3d mapping */
-static BOOL WINAPI IWineD3DCubeTextureImpl_GetDirty(IWineD3DCubeTexture *iface) {
- return basetexture_get_dirty((IWineD3DBaseTexture *)iface);
-}
-
/* Context activation is done by the caller. */
static HRESULT WINAPI IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *iface, BOOL srgb) {
IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface;
@@ -440,7 +435,6 @@ static const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl =
IWineD3DCubeTextureImpl_GetAutoGenFilterType,
IWineD3DCubeTextureImpl_GenerateMipSubLevels,
IWineD3DCubeTextureImpl_SetDirty,
- IWineD3DCubeTextureImpl_GetDirty,
IWineD3DCubeTextureImpl_BindTexture,
IWineD3DCubeTextureImpl_IsCondNP2,
/* IWineD3DCubeTexture */
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 915a55f..9fe7280 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -266,10 +266,6 @@ static BOOL WINAPI IWineD3DTextureImpl_SetDirty(IWineD3DTexture *iface, BOOL dir
return basetexture_set_dirty((IWineD3DBaseTexture *)iface, dirty);
}
-static BOOL WINAPI IWineD3DTextureImpl_GetDirty(IWineD3DTexture *iface) {
- return basetexture_get_dirty((IWineD3DBaseTexture *)iface);
-}
-
/* Context activation is done by the caller. */
static HRESULT WINAPI IWineD3DTextureImpl_BindTexture(IWineD3DTexture *iface, BOOL srgb) {
IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface;
@@ -454,7 +450,6 @@ static const IWineD3DTextureVtbl IWineD3DTexture_Vtbl =
IWineD3DTextureImpl_GetAutoGenFilterType,
IWineD3DTextureImpl_GenerateMipSubLevels,
IWineD3DTextureImpl_SetDirty,
- IWineD3DTextureImpl_GetDirty,
IWineD3DTextureImpl_BindTexture,
IWineD3DTextureImpl_IsCondNP2,
/* IWineD3DTexture */
diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c
index 99fa75f..3d1a22b 100644
--- a/dlls/wined3d/volumetexture.c
+++ b/dlls/wined3d/volumetexture.c
@@ -230,10 +230,6 @@ static BOOL WINAPI IWineD3DVolumeTextureImpl_SetDirty(IWineD3DVolumeTexture *ifa
return basetexture_set_dirty((IWineD3DBaseTexture *)iface, dirty);
}
-static BOOL WINAPI IWineD3DVolumeTextureImpl_GetDirty(IWineD3DVolumeTexture *iface) {
- return basetexture_get_dirty((IWineD3DBaseTexture *)iface);
-}
-
/* Context activation is done by the caller. */
static HRESULT WINAPI IWineD3DVolumeTextureImpl_BindTexture(IWineD3DVolumeTexture *iface, BOOL srgb)
{
@@ -370,7 +366,6 @@ static const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl =
IWineD3DVolumeTextureImpl_GetAutoGenFilterType,
IWineD3DVolumeTextureImpl_GenerateMipSubLevels,
IWineD3DVolumeTextureImpl_SetDirty,
- IWineD3DVolumeTextureImpl_GetDirty,
/* not in d3d */
IWineD3DVolumeTextureImpl_BindTexture,
IWineD3DVolumeTextureImpl_IsCondNP2,
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index b21d617..4b6b109 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1915,7 +1915,6 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surfac
void basetexture_cleanup(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN;
void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN;
WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN;
-BOOL basetexture_get_dirty(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN;
DWORD basetexture_get_level_count(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN;
DWORD basetexture_get_lod(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN;
IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture,
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index 8876c3b..3b4fda4 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -2528,8 +2528,6 @@ interface IWineD3DBaseTexture : IWineD3DResource
BOOL SetDirty(
BOOL dirty
);
- BOOL GetDirty(
- );
HRESULT BindTexture(
[in] BOOL srgb
);
More information about the wine-cvs
mailing list