Changeset 32545 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface.c

Timestamp:

Sep 16, 2010 10:00:43 AM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: wine multi-swapchain fixes, umd driver fixes

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface.c (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface.c

@@ -488 +488 @@
         Assert(shared_handle);
         VBOXSHRC_SET_INITIALIZED(surface);
-        IWineD3DSurface_LoadLocation(surface, SFLAG_INTEXTURE, NULL);
+        IWineD3DSurface_LoadLocation((IWineD3DSurface*)surface, SFLAG_INTEXTURE, NULL);
         if (!VBOXSHRC_IS_SHARED_OPENED(surface))
         {
@@ -3792 +3792 @@
         if (wined3d_settings.strict_draw_ordering || (dstSwapchain
                 && ((IWineD3DSurface *)This == dstSwapchain->frontBuffer
-                || dstSwapchain->num_contexts > 1)))
+#ifdef VBOXWDDM
+                || dstSwapchain->device->numContexts > 1
+#else
+                || dstSwapchain->num_contexts > 1
+#endif
+                )))
             wglFlush(); /* Flush to ensure ordering across contexts. */
 
@@ -4402 +4407 @@
     if (wined3d_settings.strict_draw_ordering || (swapchain
             && ((IWineD3DSurface *)This == swapchain->frontBuffer
-            || swapchain->num_contexts > 1)))
+#ifdef VBOXWDDM
+            || swapchain->device->numContexts > 1
+#else
+            || swapchain->num_contexts > 1
+#endif
+            )))
         wglFlush(); /* Flush to ensure ordering across contexts. */