Changeset 50100 in vbox for trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c

Timestamp:

Jan 17, 2014 6:32:44 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: bugfixes

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c (modified) (6 diffs)

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c

@@ -1427 +1427 @@
 }
 
-static int32_t crStateLoadKeys(CRHashTable *pHash, PSSMHANDLE pSSM)
+static int32_t crStateLoadKeys(CRHashTable *pHash, PSSMHANDLE pSSM, uint32_t u32Version)
 {
     uint32_t u32Key, u32Count, i;
@@ -1444 +1444 @@
         CRASSERT(u32Count);
 
-        for (i = u32Key; i < u32Count + u32Key; ++i)
-        {
-            GLboolean fIsNew = crHashtableAllocRegisterKey(pHash, i);
-            CRASSERT(fIsNew);
+        if (u32Version > SHCROGL_SSM_VERSION_WITH_BUGGY_KEYS)
+        {
+            for (i = u32Key; i < u32Count + u32Key; ++i)
+            {
+                GLboolean fIsNew = crHashtableAllocRegisterKey(pHash, i);
+                CRASSERT(fIsNew);
+            }
         }
     }
@@ -2232 +2235 @@
         if (u32Version >= SHCROGL_SSM_VERSION_WITH_ALLOCATED_KEYS)
         {
-            rc = crStateLoadKeys(pContext->shared->buffersTable, pSSM);
+            rc = crStateLoadKeys(pContext->shared->buffersTable, pSSM, u32Version);
             AssertRCReturn(rc, rc);
         }
@@ -2342 +2345 @@
         if (u32Version >= SHCROGL_SSM_VERSION_WITH_ALLOCATED_KEYS)
         {
-            rc = crStateLoadKeys(pContext->shared->textureTable, pSSM);
+            rc = crStateLoadKeys(pContext->shared->textureTable, pSSM, u32Version);
             AssertRCReturn(rc, rc);
         }
@@ -2471 +2474 @@
         if (u32Version >= SHCROGL_SSM_VERSION_WITH_ALLOCATED_KEYS)
         {
-            rc = crStateLoadKeys(pContext->shared->fbTable, pSSM);
+            rc = crStateLoadKeys(pContext->shared->fbTable, pSSM, u32Version);
             AssertRCReturn(rc, rc);
         }
@@ -2496 +2499 @@
         if (u32Version >= SHCROGL_SSM_VERSION_WITH_ALLOCATED_KEYS)
         {
-            rc = crStateLoadKeys(pContext->shared->rbTable, pSSM);
+            rc = crStateLoadKeys(pContext->shared->rbTable, pSSM, u32Version);
             AssertRCReturn(rc, rc);
         }