Changeset 50405 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Feb 10, 2014 8:10:18 PM (11 years ago)

Author:

vboxsync

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

92168

Message:

crOpenGL: include 3D data in framebuffer saved state snapshot, saved state fix

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserverlib/server_main.c (modified) (3 diffs)
• crserverlib/server_presenter.cpp (modified) (1 diff)
• render/renderspu.c (modified) (1 diff)

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

@@ -137 +137 @@
     GLint i;
     CRClientNode *pNode, *pNext;
+    GLboolean fOldEnableDiff;
 
     /* avoid a race condition */
@@ -159 +160 @@
     cr_server.currentMural = NULL;
 
-    if (CrBltIsInitialized(&cr_server.Blitter))
-    {
-        CrBltTerm(&cr_server.Blitter);
-    }
-
     /* sync our state with renderspu,
      * do it before mural & context deletion to avoid deleting currently set murals/contexts*/
@@ -179 +175 @@
     crFreeHashtable(cr_server.contextTable, deleteContextInfoCallback);
 
+    /* synchronize with reality */
+    fOldEnableDiff = crStateEnableDiffOnMakeCurrent(GL_FALSE);
+    Assert(cr_server.MainContextInfo.pContext);
+    crStateMakeCurrent(cr_server.MainContextInfo.pContext);
+    crStateEnableDiffOnMakeCurrent(fOldEnableDiff);
+
     /* Free vertex programs */
     crFreeHashtable(cr_server.programTable, crFree);
 
+    /* Free murals */
+    crFreeHashtable(cr_server.muralTable, deleteMuralInfoCallback);
+
+    CrPMgrTerm();
+
+    if (CrBltIsInitialized(&cr_server.Blitter))
+    {
+        CrBltTerm(&cr_server.Blitter);
+    }
+
     /* Free dummy murals */
     crFreeHashtable(cr_server.dummyMuralTable, deleteMuralInfoCallback);
-
-    /* Free murals */
-    crFreeHashtable(cr_server.muralTable, deleteMuralInfoCallback);
-
-    CrPMgrTerm();
 
     for (i = 0; i < cr_server.numClients; i++) {

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -4139 +4139 @@
         crFree(pRects);
 
+    CrFbEntryRelease(pFb, hEntry);
+
     return VINF_SUCCESS;
 }

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -302 +302 @@
 
     curCtx = GET_CONTEXT_VAL();
-    CRASSERT(curCtx);
+//    CRASSERT(curCtx);
     if (curCtx == context)
     {