Changeset 50802 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Timestamp:

Mar 17, 2014 2:25:13 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: do not create invisible windows (fix OSX deadlock)

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_main.c (modified) (1 diff)
• server_window.c (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -1005 +1005 @@
             return NULL;
         }
-        id = crServerMuralInit(pMural, "", visualBits, 0);
+        id = crServerMuralInit(pMural,
+#ifdef RT_OS_DARWIN
+                /* tested on darwin only so far */
+                NULL
+#else
+                ""
+#endif
+                , visualBits, 0);
         if (id < 0)
         {

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_window.c

@@ -24 +24 @@
     GLint dims[2];
     GLint windowID = -1;
-    GLint spuWindow;
+    GLint spuWindow = 0;
     GLint realVisBits = visBits;
 
@@ -32 +32 @@
         realVisBits = cr_server.fVisualBitsDefault;
 
-    /*
-     * Have first SPU make a new window.
-     */
-    spuWindow = cr_server.head_spu->dispatch_table.WindowCreate( dpyName, realVisBits );
-    if (spuWindow < 0) {
-        return spuWindow;
+    if (!dpyName)
+    {
+        /*
+         * Have first SPU make a new window.
+         */
+        spuWindow = cr_server.head_spu->dispatch_table.WindowCreate( dpyName, realVisBits );
+        if (spuWindow < 0) {
+            return spuWindow;
+        }
+    }
+    else
+    {
+        CRMuralInfo *dummy = crServerGetDummyMural(visBits);
+        if (!dummy)
+        {
+            WARN(("crServerGetDummyMural failed"));
+            return -1;
+        }
+        spuWindow = dummy->spuWindow;
     }
 
@@ -202 +215 @@
     }
 
-    cr_server.head_spu->dispatch_table.WindowDestroy( mural->spuWindow );
+    if (!mural->CreateInfo.pszDpyName)
+        cr_server.head_spu->dispatch_table.WindowDestroy( mural->spuWindow );
+
+    mural->spuWindow = 0;
 
     if (mural->pVisibleRects)