wined3d: Don't claim SYSMEM location to be current if memory was evicted.

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Don't claim SYSMEM location to be current if memory was evicted.
58016408 · Matteo Bruni · Alexandre Julliard · bb16263f · 58016408
Commit 58016408 authored Sep 15, 2017 by Matteo Bruni Committed by Alexandre Julliard Sep 18, 2017
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

surface.c dlls/wined3d/surface.c +2 -1

No files found.
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3539,7 +3539,8 @@ static DWORD cpu_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit
        ERR("Failed to blit.\n");
    wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location);
-    return dst_texture->resource.map_binding | dst_location;
+    return dst_location | (dst_texture->sub_resources[dst_sub_resource_idx].locations
+            & dst_texture->resource.map_binding);
 }
 static const struct wined3d_blitter_ops cpu_blitter_ops =