[PATCH 1/4] wined3d: The basetexture_set_dirty() return value is never used.

Henri Verbeet hverbeet at codeweavers.com
Wed Mar 2 01:55:46 CST 2011


---
 dlls/wined3d/basetexture.c     |    7 +------
 dlls/wined3d/wined3d_private.h |    2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c
index 8b2797e..2c88675 100644
--- a/dlls/wined3d/basetexture.c
+++ b/dlls/wined3d/basetexture.c
@@ -232,15 +232,10 @@ void basetexture_generate_mipmaps(IWineD3DBaseTextureImpl *texture)
     FIXME("texture %p stub!\n", texture);
 }
 
-BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty)
+void basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty)
 {
-    BOOL old;
-
-    old = texture->baseTexture.texture_rgb.dirty || texture->baseTexture.texture_srgb.dirty;
     texture->baseTexture.texture_rgb.dirty = dirty;
     texture->baseTexture.texture_srgb.dirty = dirty;
-
-    return old;
 }
 
 /* Context activation is done by the caller. */
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 0487a78..3155b04 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1925,7 +1925,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, const struct wined3d_
         const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN;
 HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTextureImpl *texture,
         WINED3DTEXTUREFILTERTYPE filter_type) DECLSPEC_HIDDEN;
-BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) DECLSPEC_HIDDEN;
+void basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) DECLSPEC_HIDDEN;
 DWORD basetexture_set_lod(IWineD3DBaseTextureImpl *texture, DWORD lod) DECLSPEC_HIDDEN;
 void basetexture_unload(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN;
 
-- 
1.7.3.4




More information about the wine-patches mailing list