wined3d: Simply use surface_modify_location() in IWineD3DSurfaceImpl_Map() with…

wined3d: Simply use surface_modify_location() in IWineD3DSurfaceImpl_Map() with WINED3DLOCK_DISCARD. The call to surface_add_dirty_rect() would have taken care of evicting the other locations anyway, but we really shouldn't be touching the location flags directly.

wined3d: Simply use surface_modify_location() in IWineD3DSurfaceImpl_Map() with…
78abb8ae · Henri Verbeet · Alexandre Julliard · d3fd7b24 · 78abb8ae
Commit 78abb8ae authored Nov 11, 2010 by Henri Verbeet Committed by Alexandre Julliard Nov 11, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

surface.c dlls/wined3d/surface.c +5 -5

No files found.
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1655,11 +1655,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Map(IWineD3DSurface *iface,
        TRACE("Warning: trying to lock unlockable surf@%p\n", This);
    }
-    if (Flags & WINED3DLOCK_DISCARD) {
+    if (Flags & WINED3DLOCK_DISCARD)
-        /* Set SFLAG_INSYSMEM, so we'll never try to download the data from the texture. */
+    {
-        TRACE("WINED3DLOCK_DISCARD flag passed, marking local copy as up to date\n");
+        TRACE("WINED3DLOCK_DISCARD flag passed, marking SYSMEM as up to date.\n");
-        surface_prepare_system_memory(This); /* Makes sure memory is allocated */
+        surface_prepare_system_memory(This);
-        This->Flags |= SFLAG_INSYSMEM;
+        surface_modify_location(This, SFLAG_INSYSMEM, TRUE);
        goto lock_end;
    }