Changeset 30487 in vbox

Timestamp:

Jun 29, 2010 1:06:35 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: disable new tracking code for compiz

File:

• trunk/src/VBox/Additions/common/crOpenGL/load.c (modified) (3 diffs)

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

@@ -754 +754 @@
     const char *app_id;
     int i;
+    int disable_sync = 0;
 
     if (stub_initialized)
@@ -762 +763 @@
     crGetProcName(response, 1024);
     crDebug("Stub launched for %s", response);
+
+#if defined(CR_NEWWINTRACK) && !defined(WINDOWS)
+    /*@todo when vm boots with compiz turned on, new code causes hang in xcb_wait_for_reply in the sync thread*/
+    if (!crStrcmp(response, "compiz") || !crStrcmp(response, "compiz_real"))
+    {
+        disable_sync = 1;
+    }
+#endif
 
     /* @todo check if it'd be of any use on other than guests, no use for windows */
@@ -852 +861 @@
         RTR3Init();
 
-        crDebug("Starting sync thread");
-
-        rc = RTThreadCreate(&stub.hSyncThread, stubSyncThreadProc, NULL, 0, RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, "Sync");
-        if (RT_FAILURE(rc))
-        {
-            crError("Failed to start sync thread! (%x)", rc);
-        }
-        RTThreadUserWait(stub.hSyncThread, 60 * 1000);
-        RTThreadUserReset(stub.hSyncThread);
-
-        crDebug("Going on");
+        if (!disable_sync)
+        {
+            crDebug("Starting sync thread");
+
+            rc = RTThreadCreate(&stub.hSyncThread, stubSyncThreadProc, NULL, 0, RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, "Sync");
+            if (RT_FAILURE(rc))
+            {
+                crError("Failed to start sync thread! (%x)", rc);
+            }
+            RTThreadUserWait(stub.hSyncThread, 60 * 1000);
+            RTThreadUserReset(stub.hSyncThread);
+
+            crDebug("Going on");
+        }
     }
 #endif