Changeset 51141 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

Timestamp:

Apr 25, 2014 12:51:03 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: crcmd enhancements & fixes; osx deadlock fix; temporary disabled crcmd for testing

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (9 diffs)

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

@@ -146 +146 @@
 }
 
+static int crVBoxServerCrCmdDisablePostProcess(VBOXCRCMDCTL_HGCMENABLE_DATA *pData);
+
 static void crServerTearDown( void )
 {
@@ -151 +153 @@
     CRClientNode *pNode, *pNext;
     GLboolean fOldEnableDiff;
+    GLboolean fContextsDeleted = GL_FALSE;
 
     /* avoid a race condition */
@@ -173 +176 @@
         }
 
-        rc = crVBoxServerHgcmEnable(&EnableData);
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("crVBoxServerHgcmEnable failed %d", rc));
-            return;
-        }
+        crVBoxServerCrCmdDisablePostProcess(&EnableData);
+        fContextsDeleted = GL_TRUE;
 
         CRASSERT(DisableData.pfnNotifyTermDone);
@@ -201 +200 @@
     cr_server.currentMural = NULL;
 
-    /* sync our state with renderspu,
-     * do it before mural & context deletion to avoid deleting currently set murals/contexts*/
-    cr_server.head_spu->dispatch_table.MakeCurrent(CR_RENDER_DEFAULT_WINDOW_ID, 0, CR_RENDER_DEFAULT_CONTEXT_ID);
+    if (!fContextsDeleted)
+    {
+        /* sync our state with renderspu,
+         * do it before mural & context deletion to avoid deleting currently set murals/contexts*/
+        cr_server.head_spu->dispatch_table.MakeCurrent(CR_RENDER_DEFAULT_WINDOW_ID, 0, CR_RENDER_DEFAULT_CONTEXT_ID);
+    }
 
     /* Deallocate all semaphores */
@@ -217 +219 @@
 
     /* synchronize with reality */
-    fOldEnableDiff = crStateEnableDiffOnMakeCurrent(GL_FALSE);
-    if(cr_server.MainContextInfo.pContext)
-        crStateMakeCurrent(cr_server.MainContextInfo.pContext);
-    crStateEnableDiffOnMakeCurrent(fOldEnableDiff);
+    if (!fContextsDeleted)
+    {
+        fOldEnableDiff = crStateEnableDiffOnMakeCurrent(GL_FALSE);
+        if(cr_server.MainContextInfo.pContext)
+            crStateMakeCurrent(cr_server.MainContextInfo.pContext);
+        crStateEnableDiffOnMakeCurrent(fOldEnableDiff);
+    }
 
     /* Free vertex programs */
@@ -4170 +4175 @@
 }
 
+
+static DECLCALLBACK(bool) crVBoxServerHasDataForScreen(uint32_t u32ScreenID)
+{
+    HCR_FRAMEBUFFER hFb = CrPMgrFbGetEnabled(u32ScreenID);
+    if (hFb)
+        return CrFbHas3DData(hFb);
+
+    return false;
+}
+
+
 static DECLCALLBACK(bool) crVBoxServerHasData()
 {
@@ -4218 +4234 @@
 
             pSetup->MainInterface.pfnHasData = crVBoxServerHasData;
+            pSetup->MainInterface.pfnHasDataForScreen = crVBoxServerHasDataForScreen;
 
             rc = VINF_SUCCESS;
@@ -4236 +4253 @@
 }
 
-int32_t crVBoxServerHgcmEnable(VBOXCRCMDCTL_HGCMENABLE_DATA *pData)
+static int crVBoxServerCrCmdDisablePostProcess(VBOXCRCMDCTL_HGCMENABLE_DATA *pData)
 {
     int rc = VINF_SUCCESS;
@@ -4257 +4274 @@
     }
 
+    memset(&cr_server.DisableData, 0, sizeof (cr_server.DisableData));
+
+    return VINF_SUCCESS;
+}
+
+int32_t crVBoxServerHgcmEnable(VBOXCRCMDCTL_HGCMENABLE_DATA *pData)
+{
+    int rc = crVBoxServerCrCmdDisablePostProcess(pData);
+    if (RT_FAILURE(rc))
+    {
+        WARN(("crVBoxServerCrCmdDisablePostProcess failed %d", rc));
+        return rc;
+    }
+
     crVBoxServerDefaultContextSet();
-
-    memset(&cr_server.DisableData, 0, sizeof (cr_server.DisableData));
 
     return VINF_SUCCESS;