Changeset 24171 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 29, 2009 5:33:12 PM (15 years ago)

Author:

vboxsync

Message:

2d accel: fix snapshot restore

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxFBOverlay.h (modified) (1 diff)
• src/VBoxFBOverlay.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxFBOverlay.h

@@ -1060 +1060 @@
 
     int vhwaSaveSurface(struct SSMHANDLE * pSSM, VBoxVHWASurfaceBase *pSurf, uint32_t surfCaps);
-    int vhwaLoadSurface(VHWACommandList * pCmdList, struct SSMHANDLE * pSSM, uint32_t u32Version);
+    int vhwaLoadSurface(VHWACommandList * pCmdList, struct SSMHANDLE * pSSM, uint32_t cBackBuffers, uint32_t u32Version);
     int vhwaSaveOverlayData(struct SSMHANDLE * pSSM, VBoxVHWASurfaceBase *pSurf, bool bVisible);
     int vhwaLoadOverlayData(VHWACommandList * pCmdList, struct SSMHANDLE * pSSM, uint32_t u32Version);

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -3673 +3673 @@
 }
 
-int VBoxGLWidget::vhwaLoadSurface(VHWACommandList * pCmdList, struct SSMHANDLE * pSSM, uint32_t u32Version)
+int VBoxGLWidget::vhwaLoadSurface(VHWACommandList * pCmdList, struct SSMHANDLE * pSSM, uint32_t cBackBuffers, uint32_t u32Version)
 {
     Q_UNUSED(u32Version);
@@ -3734 +3734 @@
         {
             Assert(0);
+        }
+
+        if(cBackBuffers)
+        {
+            pCreateSurf->SurfInfo.cBackBuffers = cBackBuffers;
+            pCreateSurf->SurfInfo.surfCaps |= VBOXVHWA_SCAPS_COMPLEX;
         }
 
@@ -4008 +4014 @@
         for(uint32_t i = 0; i < u32; ++i)
         {
-            rc = vhwaLoadSurface(pCmdList, pSSM, u32Version);  AssertRC(rc);
+            rc = vhwaLoadSurface(pCmdList, pSSM, 0, u32Version);  AssertRC(rc);
             if(RT_FAILURE(rc))
                 break;
@@ -4024 +4030 @@
                     for(uint32_t j = 0; j < cSurfs; ++j)
                     {
-                        rc = vhwaLoadSurface(pCmdList, pSSM, u32Version);  AssertRC(rc);
+                        rc = vhwaLoadSurface(pCmdList, pSSM, cSurfs - 1, u32Version);  AssertRC(rc);
                         if(RT_FAILURE(rc))
                             break;