From fe425a2f23180ccbec4434ca9796167963fd0f6c Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Wed, 2 Mar 2011 08:55:47 +0100 Subject: [PATCH] wined3d: Use basetexture_set_dirty() in some more places. --- 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 2c886753e20..20685e4de3a 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 0fc5aba08e0..47dcc2baf61 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 df52996ff2e..32ff66b4cd3 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 7c98cc989b5..e877cfb7096 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 6ebd1c2f859..2ac60913675 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;