Changeset 48900 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Oct 4, 2013 8:07:33 PM (11 years ago)

Author:

vboxsync

Message:

wined3d: better viewport fix

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new

Files:

• d3d9/device.c (modified) (1 diff)
• wined3d/device.c (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/d3d9/device.c

@@ -1468 +1468 @@
     wined3d_mutex_lock();
     hr = wined3d_device_set_render_target(device->wined3d_device, idx,
-            surface_impl ? surface_impl->wined3d_surface : NULL, TRUE);
+            surface_impl ? surface_impl->wined3d_surface : NULL,
+#ifdef VBOX_WITH_WDDM
+                    FALSE
+#else
+                    TRUE
+#endif
+                    );
     wined3d_mutex_unlock();
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/device.c

@@ -4541 +4541 @@
     }
 
-#ifdef VBOX_WITH_WDDM
-    /* @todo: should we extend this to XPDM as well?
-     * MSDN says that setting a *new* render target causes the viewport update to full size of the rt.*/
-    prev = device->fb.render_targets[render_target_idx];
-    if (render_target == prev)
-        return WINED3D_OK;
-#endif
-
     /* Set the viewport and scissor rectangles, if requested. Tests show that
      * stateblock recording is ignored, the change goes directly into the
@@ -4571 +4563 @@
     }
 
-#ifndef VBOX_WITH_WDDM
+
     prev = device->fb.render_targets[render_target_idx];
     if (render_target == prev)
         return WINED3D_OK;
-#endif
 
     if (render_target)