vbox的更動 49216 路徑 trunk/src/VBox/GuestHost/OpenGL/state_tracker

時間撮記:

2013-10-21 下午05:25:21 (11 年 以前)

作者:

vboxsync

訊息:

crOpenGL: registered keys save/restore

檔案:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c (修改) (8 筆差異)

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

@@ -1407 +1407 @@
 }
 
+static void crStateSaveKeysCB(unsigned long firstKey, unsigned long count, void *data)
+{
+    PSSMHANDLE pSSM = (PSSMHANDLE)data;
+    int rc;
+    CRASSERT(firstKey);
+    CRASSERT(count);
+    rc = SSMR3PutU32(pSSM, firstKey);
+    CRASSERT(RT_SUCCESS(rc));
+    rc = SSMR3PutU32(pSSM, count);
+    CRASSERT(RT_SUCCESS(rc));
+}
+
+static int32_t crStateSaveKeys(CRHashTable *pHash, PSSMHANDLE pSSM)
+{
+    crHashtableWalkKeys(pHash, crStateSaveKeysCB , pSSM);
+    /* use null terminator */
+    SSMR3PutU32(pSSM, 0);
+    return VINF_SUCCESS;
+}
+
+static int32_t crStateLoadKeys(CRHashTable *pHash, PSSMHANDLE pSSM)
+{
+    uint32_t u32Key, u32Count, i;
+    int rc;
+    for(;;)
+    {
+        rc = SSMR3GetU32(pSSM, &u32Key);
+        AssertRCReturn(rc, rc);
+
+        if (!u32Key)
+            return rc;
+
+        rc = SSMR3GetU32(pSSM, &u32Count);
+        AssertRCReturn(rc, rc);
+
+        CRASSERT(u32Count);
+
+        for (i = u32Key; i < u32Count + u32Key; ++i)
+        {
+            GLboolean fIsNew = crHashtableAllocRegisterKey(pHash, i);
+            CRASSERT(fIsNew);
+        }
+    }
+
+    return rc;
+}
+
+
 int32_t crStateSaveContext(CRContext *pContext, PSSMHANDLE pSSM)
 {
@@ -1503 +1551 @@
     {
         CRASSERT(pContext->shared && pContext->shared->textureTable);
+        rc = crStateSaveKeys(pContext->shared->textureTable, pSSM);
+        AssertRCReturn(rc, rc);
         ui32 = crHashtableNumElements(pContext->shared->textureTable);
         rc = SSMR3PutU32(pSSM, ui32);
@@ -1600 +1650 @@
 #ifdef CR_ARB_vertex_buffer_object
     /* Save buffer objects */
+    if (bSaveShared)
+    {
+        rc = crStateSaveKeys(pContext->shared->buffersTable, pSSM);
+        AssertRCReturn(rc, rc);
+    }
     ui32 = bSaveShared? crHashtableNumElements(pContext->shared->buffersTable):0;
     rc = SSMR3PutU32(pSSM, ui32);
@@ -1667 +1722 @@
     if (bSaveShared)
     {
+        rc = crStateSaveKeys(pContext->shared->fbTable, pSSM);
+        AssertRCReturn(rc, rc);
         ui32 = crHashtableNumElements(pContext->shared->fbTable);
         rc = SSMR3PutU32(pSSM, ui32);
         AssertRCReturn(rc, rc);
         crHashtableWalk(pContext->shared->fbTable, crStateSaveFramebuffersCB, pSSM);
+
+        rc = crStateSaveKeys(pContext->shared->rbTable, pSSM);
+        AssertRCReturn(rc, rc);
         ui32 = crHashtableNumElements(pContext->shared->rbTable);
         rc = SSMR3PutU32(pSSM, ui32);
@@ -2169 +2229 @@
         /* Load shared textures */
         CRASSERT(pContext->shared && pContext->shared->textureTable);
+
+        if (u32Version >= SHCROGL_SSM_VERSION_WITH_ALLOCATED_KEYS)
+        {
+            rc = crStateLoadKeys(pContext->shared->buffersTable, pSSM);
+            AssertRCReturn(rc, rc);
+        }
+
         rc = SSMR3GetU32(pSSM, &uiNumElems);
         AssertRCReturn(rc, rc);
@@ -2271 +2338 @@
     /* Load buffer objects */
 #ifdef CR_ARB_vertex_buffer_object
+    if (bLoadShared)
+    {
+        if (u32Version >= SHCROGL_SSM_VERSION_WITH_ALLOCATED_KEYS)
+        {
+            rc = crStateLoadKeys(pContext->shared->textureTable, pSSM);
+            AssertRCReturn(rc, rc);
+        }
+    }
+
     rc = SSMR3GetU32(pSSM, &uiNumElems);
     AssertRCReturn(rc, rc);
@@ -2393 +2469 @@
     if (bLoadShared)
     {
+        if (u32Version >= SHCROGL_SSM_VERSION_WITH_ALLOCATED_KEYS)
+        {
+            rc = crStateLoadKeys(pContext->shared->fbTable, pSSM);
+            AssertRCReturn(rc, rc);
+        }
+
         rc = SSMR3GetU32(pSSM, &uiNumElems);
         AssertRCReturn(rc, rc);
@@ -2410 +2492 @@
 
             crHashtableAdd(pContext->shared->fbTable, key, pFBO);
+        }
+
+        if (u32Version >= SHCROGL_SSM_VERSION_WITH_ALLOCATED_KEYS)
+        {
+            rc = crStateLoadKeys(pContext->shared->rbTable, pSSM);
+            AssertRCReturn(rc, rc);
         }