Changeset 47161 in vbox for trunk/src/VBox

Timestamp:

Jul 15, 2013 2:02:27 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: fix wddm init & win state handling

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• context.c (modified) (2 diffs)
• load.c (modified) (2 diffs)

trunk/src/VBox/Additions/common/crOpenGL/context.c

@@ -153 +153 @@
 # endif
 #endif
+
         stubForcedFlush(con);
 
@@ -1320 +1321 @@
         }
 #ifdef VBOX_WITH_WDDM
-        stub.spu->dispatch_table.WindowVisibleRegion(window->spuWindow, 0, NULL);
+        if (stub.trackWindowVisibleRgn)
+            stub.spu->dispatch_table.WindowVisibleRegion(window->spuWindow, 0, NULL);
 #endif
     }

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -955 +955 @@
         disable_sync = 1;
     }
-#elif defined(WINDOWS) && defined(VBOX_WITH_WDDM)
-    hVBoxD3D = NULL;
-    if (!GetModuleHandleEx(0, VBOX_MODNAME_DISPD3D, &hVBoxD3D))
-    {
-        crDebug("GetModuleHandleEx failed err %d", GetLastError());
-        hVBoxD3D = NULL;
-    }
-
-    if (hVBoxD3D)
-    {
-        disable_sync = 1;
-        crDebug("running with %s", VBOX_MODNAME_DISPD3D);
-        stub.trackWindowVisibleRgn = 0;
-        stub.trackWindowSize = 0;
-        stub.trackWindowPos = 0;
-        stub.trackWindowVisibility = 0;
-        stub.trackWindowVisibleRgn = 0;
-        stub.bRunningUnderWDDM = true;
-    }
 #endif
 
@@ -1026 +1007 @@
 
     stubSetDefaultConfigurationOptions();
+
+#if defined(WINDOWS) && defined(VBOX_WITH_WDDM)
+    hVBoxD3D = NULL;
+    if (!GetModuleHandleEx(0, VBOX_MODNAME_DISPD3D, &hVBoxD3D))
+    {
+        crDebug("GetModuleHandleEx failed err %d", GetLastError());
+        hVBoxD3D = NULL;
+    }
+
+    if (hVBoxD3D)
+    {
+        disable_sync = 1;
+        crDebug("running with %s", VBOX_MODNAME_DISPD3D);
+        stub.trackWindowVisibleRgn = 0;
+        /* @todo: should we enable that? */
+        stub.trackWindowSize = 0;
+        stub.trackWindowPos = 0;
+        stub.trackWindowVisibility = 0;
+        stub.bRunningUnderWDDM = true;
+    }
+#endif
 
     stub.spu = crSPULoadChain( num_spus, spu_ids, spu_names, stub.spu_dir, NULL );