Changeset 45149 in vbox

Timestamp:

Mar 22, 2013 9:49:29 PM (12 years ago)

Author:

vboxsync

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

84468

Message:

crOpenGL: saved state update

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_version.h (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (3 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_version.h ¶

@@ -26 +26 @@
  * this is why we switched to glReadDrawPixels(GL_DEPTH_STENCIL) in one run */
 #define SHCROGL_SSM_VERSION_WITH_SINGLE_DEPTH_STENCIL               36
-#define SHCROGL_SSM_VERSION                                         36
+#define SHCROGL_SSM_VERSION_WITH_PRESENT_STATE                      37
+#define SHCROGL_SSM_VERSION                                         37
 
 /* These define the Chromium release number.

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

@@ -1684 +1684 @@
     {
         CRMuralInfo muralInfo;
+        CRMuralInfo *pActualMural = NULL;
 
         rc = SSMR3GetMem(pSSM, &key, sizeof(key));
@@ -1705 +1706 @@
         }
 
+        pActualMural = (CRMuralInfo *)crHashtableSearch(cr_server.muralTable, key);;
+        CRASSERT(pActualMural);
+
         if (version >= SHCROGL_SSM_VERSION_WITH_WINDOW_CTX_USAGE)
         {
-            CRMuralInfo *pActualMural = (CRMuralInfo *)crHashtableSearch(cr_server.muralTable, key);;
-            CRASSERT(pActualMural);
             rc = SSMR3GetMem(pSSM, pActualMural->ctxUsage, sizeof (pActualMural->ctxUsage));
             CRASSERT(rc == VINF_SUCCESS);
@@ -1727 +1729 @@
             crFree(muralInfo.pVisibleRects);
         }
+
+        Assert(!pActualMural->fDataPresented);
+
+        if (version >= SHCROGL_SSM_VERSION_WITH_PRESENT_STATE)
+            pActualMural->fDataPresented = muralInfo.fDataPresented;
+        else
+            pActualMural->fDataPresented = GL_TRUE;
     }