Changeset 24861 in vbox for trunk

Timestamp:

Nov 23, 2009 10:34:08 AM (15 years ago)

Author:

vboxsync

Message:

2d accel: fix saved state store issue

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxFBOverlay.h (modified) (3 diffs)
• src/VBoxFBOverlay.cpp (modified) (5 diffs)

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

@@ -1081 +1081 @@
 
     void vhwaSaveExec(struct SSMHANDLE * pSSM);
-    int vhwaLoadExec(VHWACommandList * pCmdList, struct SSMHANDLE * pSSM, uint32_t u32Version);
+    static void vhwaSaveExecVoid(struct SSMHANDLE * pSSM);
+    static int vhwaLoadExec(VHWACommandList * pCmdList, struct SSMHANDLE * pSSM, uint32_t u32Version);
 
     int vhwaSurfaceCanCreate(struct _VBOXVHWACMD_SURF_CANCREATE *pCmd);
@@ -1157 +1158 @@
         return bForce;
     }
+
+    VHWACommandList &onResizeCmdList() { return mOnResizeCmdList; }
 protected:
 
@@ -1202 +1205 @@
 
     int vhwaSaveSurface(struct SSMHANDLE * pSSM, VBoxVHWASurfaceBase *pSurf, uint32_t surfCaps);
-    int vhwaLoadSurface(VHWACommandList * pCmdList, struct SSMHANDLE * pSSM, uint32_t cBackBuffers, uint32_t u32Version);
+    static 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);
-    int vhwaLoadVHWAEnable(VHWACommandList * pCmdList);
+    static int vhwaLoadOverlayData(VHWACommandList * pCmdList, struct SSMHANDLE * pSSM, uint32_t u32Version);
+    static int vhwaLoadVHWAEnable(VHWACommandList * pCmdList);
+
     void vhwaDoSurfaceOverlayUpdate(VBoxVHWASurfaceBase *pDstSurf, VBoxVHWASurfaceBase *pSrcSurf, struct _VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmd);
 #endif

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

@@ -3811 +3811 @@
     Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
     VBoxGLWidget * pw = (VBoxGLWidget*)pvUser;
-    return pw->vhwaLoadExec(NULL, pSSM, u32Version);
+    return VBoxGLWidget::vhwaLoadExec(&pw->onResizeCmdList(), pSSM, u32Version);
 }
 
@@ -4123 +4123 @@
 
     return rc;
+}
+
+void VBoxGLWidget::vhwaSaveExecVoid(struct SSMHANDLE * pSSM)
+{
+    VBOXQGL_SAVE_START(pSSM);
+    int rc = SSMR3PutU32(pSSM, 0);         AssertRC(rc); /* 0 primaries */
+    rc = SSMR3PutU32(pSSM, 0);         AssertRC(rc); /* 0 overlays */
+    VBOXQGL_SAVE_STOP(pSSM);
 }
 
@@ -4239 +4247 @@
     int rc;
     uint32_t u32;
-
-    if(pCmdList == NULL)
-    {
-        /* use our own list */
-        pCmdList = &mOnResizeCmdList;
-    }
 
     rc = SSMR3GetU32(pSSM, &u32); AssertRC(rc);
@@ -5576 +5578 @@
 //    rc = SSMR3GetBool(pSSM, &bTmp /*&mOverlayVisible*/);         AssertRC(rc);
 //    if(RT_SUCCESS(rc))
-    return mpOverlayWidget->vhwaLoadExec(&mOnResizeCmdList, pSSM, u32Version);
+    return VBoxGLWidget::vhwaLoadExec(&mOnResizeCmdList, pSSM, u32Version);
 //    return rc;
 }
@@ -5585 +5587 @@
 //    rc = SSMR3PutBool(pSSM, mOverlayVisible);         AssertRC(rc);
 //
-    mpOverlayWidget->vhwaSaveExec(pSSM);
+    if(mpOverlayWidget)
+        mpOverlayWidget->vhwaSaveExec(pSSM);
+    else
+        VBoxGLWidget::vhwaSaveExecVoid(pSSM);
 }