wined3d: Don't load the draw_binding location in surface_unmap() unless the…

wined3d: Don't load the draw_binding location in surface_unmap() unless the surface is on a swapchain. It really makes no sense to do this just because a surface happens to be the current render target. In particular, this patch prevents needlessly bouncing the surface between the CPU and the GPU when the application does e.g. multiple colorkeyed blits to the current render target to draw a HUD.

wined3d: Don't load the draw_binding location in surface_unmap() unless the…
8692ff48 · Henri Verbeet · Alexandre Julliard · d1254edd · 8692ff48
Commit 8692ff48 authored Jan 20, 2012 by Henri Verbeet Committed by Alexandre Julliard Jan 20, 2012
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

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

No files found.
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -953,8 +953,14 @@ static void surface_unmap(struct wined3d_surface *surface)
        goto done;
    }
+    /* FIXME: The ORM_BACKBUFFER case probably isn't needed, but who knows
+     * what obscure bugs in backbuffer ORM removing it will uncover. Also,
+     * this should only be needed for the frontbuffer, but that requires
+     * present calls to call surface_load_location() on the backbuffer.
+     * Fix both of those after 1.4. */
    if (surface->container.type == WINED3D_CONTAINER_SWAPCHAIN
-            || (device->fb.render_targets && surface == device->fb.render_targets[0]))
+            || (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER
+            && device->fb.render_targets && surface == device->fb.render_targets[0]))
    {
        if (!surface->dirtyRect.left && !surface->dirtyRect.top
                && surface->dirtyRect.right == surface->resource.width