Changeset 52429 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

Timestamp:

Aug 20, 2014 11:58:38 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95613

Message:

crOpenGL: 1. osx: do everything we can do in the main thread 2. bugfixes

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -1101 +1101 @@
                     CHECK_ERROR_BREAK(pConsole, COMGETTER(Display)(pDisplay.asOutParam()));
 
-                    crServerVBoxCompositionSetEnableStateGlobal(GL_FALSE);
-
                     g_pConsole = pConsole;
                     g_u32ScreenCount = monitorCount;
@@ -1108 +1106 @@
                     rc = crVBoxServerSetScreenCount(monitorCount);
                     AssertRCReturn(rc, rc);
+
+#if 1
+                    crServerVBoxCompositionSetEnableStateGlobal(GL_FALSE);
 
                     for (i=0; i<monitorCount; ++i)
@@ -1132 +1133 @@
 
                     crServerVBoxCompositionSetEnableStateGlobal(GL_TRUE);
+#endif
 
                     rc = VINF_SUCCESS;
@@ -1536 +1538 @@
     }
     uint32_t cParams = (cbCtl - sizeof (VBOXCRCMDCTL)) / sizeof (VBOXHGCMSVCPARM);
-    return svcHostCallPerform(pCtl->u32Function, cParams, (VBOXHGCMSVCPARM*)(pCtl + 1));
+    bool fHasCallout = VBOXCRCMDCTL_IS_CALLOUT_AVAILABLE(pCtl);
+    if (fHasCallout)
+        crVBoxServerCalloutEnable(pCtl);
+
+    int rc = svcHostCallPerform(pCtl->u32Function, cParams, (VBOXHGCMSVCPARM*)(pCtl + 1));
+
+    if (fHasCallout)
+        crVBoxServerCalloutDisable();
+
+    return rc;
 }