wined3d: Call LoadLocation() on higher render targets as well, simplify some code in drawPrimitive.

It's probably rare for higher render targets to get locked or updated from sysmem, but this should still be more correct. It also makes the code simpler.

wined3d: Call LoadLocation() on higher render targets as well, simplify some code in drawPrimitive.
daa59e00 · H. Verbeet · Alexandre Julliard · 25168401 · daa59e00
Commit daa59e00 authored Jul 30, 2008 by H. Verbeet Committed by Alexandre Julliard Jul 31, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 11 deletions

drawprim.c dlls/wined3d/drawprim.c +3 -11

No files found.
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -930,17 +930,9 @@ void drawPrimitive(IWineD3DDevice *iface,
    /* Invalidate the back buffer memory so LockRect will read it the next time */
    for(i = 0; i < GL_LIMITS(buffers); i++) {
        target = (IWineD3DSurfaceImpl *) This->render_targets[i];
-
-        /* TODO: Only do all that if we're going to change anything */
-        if(target /*&& target->Flags & (SFLAG_INTEXTURE | SFLAG_INSYSMEM)*/) {
-            if(i == 0) {
-                /* Need the surface in the drawable! */
-                IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL);
-                IWineD3DSurface_ModifyLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, TRUE);
-            } else {
-                /* Must be an fbo render target */
-                IWineD3DSurface_ModifyLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, TRUE);
-            }
+        if (target) {
+            IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL);
+            IWineD3DSurface_ModifyLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, TRUE);
        }
    }