wined3d: Fix "sysmem_count" accounting in wined3d_texture_invalidate_location().

Only increase it if the sub-resource wasn't already exclusively in system memory. Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Fix "sysmem_count" accounting in wined3d_texture_invalidate_location().
0726d7e8 · Henri Verbeet · Alexandre Julliard · ef32f7eb · 0726d7e8
Commit 0726d7e8 authored May 25, 2017 by Henri Verbeet Committed by Alexandre Julliard May 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

texture.c dlls/wined3d/texture.c +3 -1

No files found.
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -155,6 +155,7 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture,
        unsigned int sub_resource_idx, DWORD location)
 {
    struct wined3d_texture_sub_resource *sub_resource;
+    DWORD previous_locations;

    TRACE("texture %p, sub_resource_idx %u, location %s.\n",
            texture, sub_resource_idx, wined3d_debug_location(location));
@@ -163,8 +164,9 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture,
        wined3d_texture_set_dirty(texture);

    sub_resource = &texture->sub_resources[sub_resource_idx];
+    previous_locations = sub_resource->locations;
    sub_resource->locations &= ~location;
-    if (sub_resource->locations == WINED3D_LOCATION_SYSMEM)
+    if (previous_locations != WINED3D_LOCATION_SYSMEM && sub_resource->locations == WINED3D_LOCATION_SYSMEM)
        ++texture->sysmem_count;

    TRACE("New locations flags are %s.\n", wined3d_debug_location(sub_resource->locations));