[PATCH 2/4] wined3d: Use basetexture_set_dirty() in some more places.

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


---
 dlls/wined3d/basetexture.c   |    3 +--
 dlls/wined3d/cubetexture.c   |    3 +--
 dlls/wined3d/texture.c       |    3 +--
 dlls/wined3d/volume.c        |    3 +--
 dlls/wined3d/volumetexture.c |    3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c
index 2c88675..20685e4 100644
--- a/dlls/wined3d/basetexture.c
+++ b/dlls/wined3d/basetexture.c
@@ -122,8 +122,7 @@ void basetexture_unload(IWineD3DBaseTextureImpl *texture)
 
     if (context) context_release(context);
 
-    texture->baseTexture.texture_rgb.dirty = TRUE;
-    texture->baseTexture.texture_srgb.dirty = TRUE;
+    basetexture_set_dirty(texture, TRUE);
 
     resource_unload(&texture->resource);
 }
diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c
index 0fc5aba..47dcc2b 100644
--- a/dlls/wined3d/cubetexture.c
+++ b/dlls/wined3d/cubetexture.c
@@ -418,8 +418,7 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_AddDirtyRect(IWineD3DCubeTexture *
         return WINED3DERR_INVALIDCALL;
     }
 
-    texture->baseTexture.texture_rgb.dirty = TRUE;
-    texture->baseTexture.texture_srgb.dirty = TRUE;
+    basetexture_set_dirty(texture, TRUE);
     surface_add_dirty_rect(surface_from_resource(sub_resource), dirty_rect);
 
     return WINED3D_OK;
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index df52996..32ff66b 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -435,8 +435,7 @@ static HRESULT WINAPI IWineD3DTextureImpl_AddDirtyRect(IWineD3DTexture *iface, c
         return WINED3DERR_INVALIDCALL;
     }
 
-    texture->baseTexture.texture_rgb.dirty = TRUE;
-    texture->baseTexture.texture_srgb.dirty = TRUE;
+    basetexture_set_dirty(texture, TRUE);
     surface_add_dirty_rect(surface_from_resource(sub_resource), dirty_rect);
 
     return WINED3D_OK;
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index 7c98cc9..e877cfb 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -279,8 +279,7 @@ static HRESULT WINAPI IWineD3DVolumeImpl_Map(IWineD3DVolume *iface,
     if (!(flags & (WINED3DLOCK_NO_DIRTY_UPDATE | WINED3DLOCK_READONLY)))
     {
         volume_add_dirty_box(This, &This->lockedBox);
-        This->container->baseTexture.texture_rgb.dirty = TRUE;
-        This->container->baseTexture.texture_srgb.dirty = TRUE;
+        basetexture_set_dirty((IWineD3DBaseTextureImpl *)This->container, TRUE);
     }
 
     This->locked = TRUE;
diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c
index 6ebd1c2..2ac6091 100644
--- a/dlls/wined3d/volumetexture.c
+++ b/dlls/wined3d/volumetexture.c
@@ -349,8 +349,7 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_AddDirtyBox(IWineD3DVolumeTextur
         return WINED3DERR_INVALIDCALL;
     }
 
-    texture->baseTexture.texture_rgb.dirty = TRUE;
-    texture->baseTexture.texture_srgb.dirty = TRUE;
+    basetexture_set_dirty(texture, TRUE);
     volume_add_dirty_box(volume_from_resource(sub_resource), dirty_box);
 
     return WINED3D_OK;
-- 
1.7.3.4




More information about the wine-patches mailing list