=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: wined3d: Call wined3d_texture_set_dirty() in wined3d_volume_invalidate_location().
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Mar 4 09:48:33 CST 2016
Module: wine
Branch: master
Commit: b23f21a9fb6e09afad6ac3327233130f8be979b2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23f21a9fb6e09afad6ac3327233130f8be979b2
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Fri Mar 4 00:05:25 2016 +0100
wined3d: Call wined3d_texture_set_dirty() in wined3d_volume_invalidate_location().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/volume.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index 2d88af6..457067d 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -109,7 +109,11 @@ void wined3d_volume_validate_location(struct wined3d_volume *volume, DWORD locat
void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location)
{
TRACE("Volume %p, clearing %s.\n", volume, wined3d_debug_location(location));
+
+ if (location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB))
+ wined3d_texture_set_dirty(volume->container);
volume->locations &= ~location;
+
TRACE("new location flags are %s.\n", wined3d_debug_location(volume->locations));
}
@@ -552,10 +556,7 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume,
}
if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY)))
- {
- wined3d_texture_set_dirty(texture);
wined3d_volume_invalidate_location(volume, ~volume->resource.map_binding);
- }
volume->resource.map_count++;
More information about the wine-cvs
mailing list