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

Timestamp:

Aug 5, 2009 12:28:09 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: fix 3d failure after snapshot loading

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserver/crservice.cpp (modified) (2 diffs)
• crserverlib/server_main.c (modified) (3 diffs)

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

@@ -70 +70 @@
 
 static const char* gszVBoxOGLSSMMagic = "***OpenGL state data***";
-#define SHCROGL_SSM_VERSION 3
+#define SHCROGL_SSM_VERSION 4
 
 typedef struct
@@ -207 +207 @@
     rc = SSMR3GetU32(pSSM, &ui32);
     AssertRCReturn(rc, rc);
-    if (SHCROGL_SSM_VERSION != ui32)
+    if ((SHCROGL_SSM_VERSION != ui32)
+        && (3 != ui32))
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
 
     /* The state itself */
-    rc = crVBoxServerLoadState(pSSM);
+    rc = crVBoxServerLoadState(pSSM, ui32);
     AssertRCReturn(rc, rc);
 

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

@@ -709 +709 @@
             AssertRCReturn(rc, rc);
 
+            rc = SSMR3PutU32(pSSM, pClient->conn->vMajor);
+            AssertRCReturn(rc, rc);
+
+            rc = SSMR3PutU32(pSSM, pClient->conn->vMinor);
+            AssertRCReturn(rc, rc);
+
             rc = SSMR3PutMem(pSSM, pClient, sizeof(*pClient));
             AssertRCReturn(rc, rc);
@@ -735 +741 @@
 }
 
-DECLEXPORT(int32_t) crVBoxServerLoadState(PSSMHANDLE pSSM)
+DECLEXPORT(int32_t) crVBoxServerLoadState(PSSMHANDLE pSSM, uint32_t version)
 {
     int32_t  rc, i;
@@ -859 +865 @@
             /* If this assert fires, then we should search correct client in the list first*/
             CRASSERT(ui == pClient->conn->u32ClientID);
+
+            if (version>=4)
+            {
+                rc = SSMR3GetU32(pSSM, &pClient->conn->vMajor);
+                AssertRCReturn(rc, rc);
+
+                rc = SSMR3GetU32(pSSM, &pClient->conn->vMinor);
+                AssertRCReturn(rc, rc);
+            }
 
             rc = SSMR3GetMem(pSSM, &client, sizeof(client));