wined3d: Only try to load surfaces from the drawable if the drawable is current…

wined3d: Only try to load surfaces from the drawable if the drawable is current in surface_load_sysmem().

wined3d: Only try to load surfaces from the drawable if the drawable is current…
4229d865 · Henri Verbeet · Alexandre Julliard · aeca2f98 · 4229d865
Commit 4229d865 authored Oct 23, 2011 by Henri Verbeet Committed by Alexandre Julliard Oct 24, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

surface.c dlls/wined3d/surface.c +9 -3

No files found.
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -5809,9 +5809,15 @@ static void surface_load_sysmem(struct wined3d_surface *surface,
        return;
    }

-    /* Note: It might be faster to download into a texture first. */
-    read_from_framebuffer(surface, rect, surface->resource.allocatedMemory,
-            wined3d_surface_get_pitch(surface));
+    if (surface->flags & SFLAG_INDRAWABLE)
+    {
+        read_from_framebuffer(surface, rect, surface->resource.allocatedMemory,
+                wined3d_surface_get_pitch(surface));
+        return;
+    }
+
+    FIXME("Can't load surface %p with location flags %#x into sysmem.\n",
+            surface, surface->flags & SFLAG_LOCATIONS);
 }

 static HRESULT surface_load_drawable(struct wined3d_surface *surface,