Changeset 51349 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Timestamp:

May 22, 2014 11:42:21 AM (11 years ago)

Author:

vboxsync

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

93835

Message:

crOpenGL: saved state fixes, misc fixes

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (3 diffs)

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

@@ -4920 +4920 @@
     int rc;
     int cDisplays = 0, i;
+
     for (i = 0; i < cr_server.screenCount; ++i)
     {
@@ -4968 +4969 @@
             AssertRCReturn(rc, rc);
 
-            rc = SSMR3PutU32(pSSM, 0xffffffff);
-            AssertRCReturn(rc, rc);
-
-            rc = CrFbSaveState(hFb, pSSM);
+            rc = SSMR3PutU32(pSSM, hFb->ScreenInfo.u32StartOffset);
             AssertRCReturn(rc, rc);
 
             CR_FB_INFO *pFbInfo = &g_CrPresenter.aFbInfos[hFb->ScreenInfo.u32ViewIndex];
             rc = SSMR3PutMem(pSSM, pFbInfo->aTargetMap, sizeof (pFbInfo->aTargetMap));
+            AssertRCReturn(rc, rc);
+
+            rc = CrFbSaveState(hFb, pSSM);
             AssertRCReturn(rc, rc);
         }
@@ -5154 +5155 @@
             AssertRCReturn(rc, rc);
 
-            uint32_t offVram = 0;
-            rc = SSMR3GetU32(pSSM, &offVram);
+            rc = SSMR3GetU32(pSSM, &Screen.u32StartOffset);
             AssertRCReturn(rc, rc);
-            if (offVram != 0xffffffff)
+            if (Screen.u32StartOffset == 0xffffffff)
             {
                 WARN(("not expected offVram"));
-                Screen.u32StartOffset = offVram;
+                Screen.u32StartOffset = 0;
             }
 
-            rc = CrFbLoadState(pFb, pSSM, version);
-            AssertRCReturn(rc, rc);
-
-            if (version >= SHCROGL_SSM_VERSION_WITH_SCREEN_MAP)
+            if (version >= SHCROGL_SSM_VERSION_WITH_SCREEN_MAP_REORDERED)
             {
                 rc = SSMR3GetMem(pSSM, aTargetMap, sizeof (aTargetMap));
                 AssertRCReturn(rc, rc);
             }
+
+            if (version == SHCROGL_SSM_VERSION_WITH_SCREEN_MAP)
+            {
+                VBOXCMDVBVA_SCREENMAP_DECL(uint32_t, aEmptyTargetMap);
+
+                memset(aEmptyTargetMap, 0, sizeof (aEmptyTargetMap));
+
+                rc = CrPMgrResize(&Screen, cr_server.fCrCmdEnabled ? NULL : CrFbGetVRAM(pFb), aEmptyTargetMap);
+                AssertRCReturn(rc, rc);
+
+                rc = CrFbLoadState(pFb, pSSM, version);
+                AssertRCReturn(rc, rc);
+
+                rc = SSMR3GetMem(pSSM, aTargetMap, sizeof (aTargetMap));
+                AssertRCReturn(rc, rc);
+            }
         }
 
         rc = CrPMgrResize(&Screen, cr_server.fCrCmdEnabled ? NULL : CrFbGetVRAM(pFb), aTargetMap);
         AssertRCReturn(rc, rc);
+
+        if (version >= SHCROGL_SSM_VERSION_WITH_FB_INFO && version != SHCROGL_SSM_VERSION_WITH_SCREEN_MAP)
+        {
+            rc = CrFbLoadState(pFb, pSSM, version);
+            AssertRCReturn(rc, rc);
+        }
     }