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

Timestamp:

Mar 6, 2013 7:45:08 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: Fedora 18 saved state working, multiple saved state fixes, debugging stuff

File:

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

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

@@ -1024 +1024 @@
     GLuint width;
     GLuint height;
-
-    CRASSERT(pCtxInfo->currentMural);
 
     crMemset(pData, 0, sizeof (*pData));
@@ -1498 +1496 @@
     }
 
+#define CR_DBG_STR_STATE_SAVE_START "VBox.Cr.StateSaveStart"
+#define CR_DBG_STR_STATE_SAVE_STOP "VBox.Cr.StateSaveStop"
+
+    if (cr_server.head_spu->dispatch_table.StringMarkerGREMEDY)
+        cr_server.head_spu->dispatch_table.StringMarkerGREMEDY(sizeof (CR_DBG_STR_STATE_SAVE_START), CR_DBG_STR_STATE_SAVE_START);
+
     /* Save rendering contexts creation info */
     ui32 = crHashtableNumElements(cr_server.contextTable);
@@ -1614 +1618 @@
     cr_server.bIsInSavingState = GL_FALSE;
 
+    if (cr_server.head_spu->dispatch_table.StringMarkerGREMEDY)
+        cr_server.head_spu->dispatch_table.StringMarkerGREMEDY(sizeof (CR_DBG_STR_STATE_SAVE_STOP), CR_DBG_STR_STATE_SAVE_STOP);
+
     return VINF_SUCCESS;
 }
@@ -1727 +1734 @@
     if (version >= SHCROGL_SSM_VERSION_WITH_SAVED_DEPTH_STENCIL_BUFFER)
     {
-        CRASSERT(cr_server.currentCtxInfo == pContextInfo);
-        CRASSERT(cr_server.currentMural = pMural);
-
         if (!pMural->width || !pMural->height)
             return VINF_SUCCESS;
@@ -1781 +1785 @@
         CRBufferState *pBuf = &pContext->buffer;
         /* can apply the data right away */
-        CRASSERT(cr_server.currentCtxInfo == pContextInfo);
-        CRASSERT(cr_server.currentMural = pMural);
-
+        CRASSERT(cr_server.currentCtxInfo == &cr_server.MainContextInfo);
+        CRASSERT(cr_server.currentMural);
+
+        cr_server.head_spu->dispatch_table.MakeCurrent( pMural->spuWindow,
+                                                                0,
+                                                                pContextInfo->SpuContext >= 0
+                                                                    ? pContextInfo->SpuContext
+                                                                      : cr_server.MainContextInfo.SpuContext);
         crStateApplyFBImage(pContext, &Data.data);
-        AssertRCReturn(rc, rc);
         CRASSERT(!pBuf->pFrontImg);
         CRASSERT(!pBuf->pBackImg);
@@ -1794 +1802 @@
             crServerPresentFBO(pMural);
         }
+
+        CRASSERT(cr_server.currentMural);
+        cr_server.head_spu->dispatch_table.MakeCurrent( cr_server.currentMural->spuWindow,
+                                                                    0,
+                                                                    cr_server.currentCtxInfo->SpuContext >= 0
+                                                                        ? cr_server.currentCtxInfo->SpuContext
+                                                                          : cr_server.MainContextInfo.SpuContext);
     }
     else
@@ -1851 +1866 @@
     }
 
+#define CR_DBG_STR_STATE_LOAD_START "VBox.Cr.StateLoadStart"
+#define CR_DBG_STR_STATE_LOAD_STOP "VBox.Cr.StateLoadStop"
+
+    if (cr_server.head_spu->dispatch_table.StringMarkerGREMEDY)
+        cr_server.head_spu->dispatch_table.StringMarkerGREMEDY(sizeof (CR_DBG_STR_STATE_LOAD_START), CR_DBG_STR_STATE_LOAD_START);
+
     /* Load and recreate rendering contexts */
     rc = SSMR3GetU32(pSSM, &uiNumElems);
@@ -1900 +1921 @@
     rc = crStateLoadGlobals(pSSM, version);
     AssertRCReturn(rc, rc);
+
+    if (uiNumElems)
+    {
+        /* ensure we have main context set up as current */
+        CRMuralInfo *pMural;
+        CRASSERT(cr_server.MainContextInfo.SpuContext > 0);
+        CRASSERT(!cr_server.currentCtxInfo);
+        CRASSERT(!cr_server.currentMural);
+        pMural = crServerGetDummyMural(cr_server.MainContextInfo.CreateInfo.visualBits);
+        CRASSERT(pMural);
+        crServerPerformMakeCurrent(pMural, &cr_server.MainContextInfo);
+    }
 
     /* Restore context state data */
@@ -1933 +1966 @@
                 CRASSERT(pMural);
             }
-
-            crServerPerformMakeCurrent(pMural, pContextInfo);
         }
 
@@ -1977 +2008 @@
             pInitialCurMural = pContextInfo->currentMural;
 
-            crServerPerformMakeCurrent(pMural, pContextInfo);
-
             rc = crVBoxServerLoadFBImage(pSSM, version, pContextInfo, pMural);
             AssertRCReturn(rc, rc);
@@ -1987 +2016 @@
         }
 
-        if (cr_server.currentCtxInfo != &cr_server.MainContextInfo)
-        {
-            /* most ogl data gets loaded to hw on chromium 3D state switch, i.e. inside crStateMakeCurrent -> crStateSwitchContext
-             * to force the crStateSwitchContext being called later, we need to  set the current context to our dummy one */
-            pMural = crServerGetDummyMural(cr_server.MainContextInfo.CreateInfo.visualBits);
-            CRASSERT(pMural);
-            crServerPerformMakeCurrent(pMural, &cr_server.MainContextInfo);
-        }
+        CRASSERT(cr_server.currentCtxInfo == &cr_server.MainContextInfo);
 
         cr_server.curClient = NULL;
@@ -2150 +2172 @@
     crVBoxServerCheckConsistency();
 #endif
+
+    if (cr_server.head_spu->dispatch_table.StringMarkerGREMEDY)
+        cr_server.head_spu->dispatch_table.StringMarkerGREMEDY(sizeof (CR_DBG_STR_STATE_LOAD_STOP), CR_DBG_STR_STATE_LOAD_STOP);
+
 
     return VINF_SUCCESS;