Changeset 22215 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Aug 13, 2009 12:41:04 AM (15 years ago)

Author:

vboxsync

Message:

video hw accel: basics for saved state support

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (4 diffs)
• DevVGA.h (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -5291 +5291 @@
 {
     vga_save(pSSMHandle, PDMINS_2_DATA(pDevIns, PVGASTATE));
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    return vbvaVHWASaveStateExec(pDevIns, pSSMHandle);
+#else
     return VINF_SUCCESS;
-}
-
+#endif
+}
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+static DECLCALLBACK(int) vgaR3SavePrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
+{
+    return vbvaVHWASaveStatePrep(pDevIns, pSSM);
+}
+#endif
 
 /**
@@ -5303 +5313 @@
  * @param   u32Version  The data unit version number.
  */
-static DECLCALLBACK(int) vgaR3LoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t u32Version)
+static DECLCALLBACK(int) vgaR3xec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t u32Version)
 {
     if (vga_load(pSSMHandle, PDMINS_2_DATA(pDevIns, PVGASTATE), u32Version))
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    return vbvaVHWALoadStateExec(pDevIns, pSSMHandle);
+#else
     return VINF_SUCCESS;
+#endif
 }
 
@@ -5546 +5560 @@
                         rc = VERR_INTERNAL_ERROR;
                     }
+#ifdef VBOX_WITH_VIDEOHWACCEL
+                    if(rc == VINF_SUCCESS)
+                    {
+                        rc = vbvaVHWAConstruct(pThis);
+                        Assert(RT_SUCCESS(rc));
+                    }
+#endif
                 }
                 else
@@ -5922 +5943 @@
     /* save */
     rc = PDMDevHlpSSMRegister(pDevIns, pDevIns->pDevReg->szDeviceName, iInstance, VGA_SAVEDSTATE_VERSION,
-                              sizeof(*pThis), NULL, vgaR3SaveExec, NULL, NULL, vgaR3LoadExec, NULL);
+                              sizeof(*pThis),
+#ifdef VBOX_WITH_VIDEOHWACCEL
+                              NULL, vgaR3SaveExec, NULL,
+#else
+                              NULL, vgaR3SaveExec, NULL,
+#endif
+                              NULL, vgaR3xec, NULL);
     if (RT_FAILURE(rc))
         return rc;

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -453 +453 @@
 # ifdef VBOX_WITH_VIDEOHWACCEL
 int vbvaVHWACommandCompleteAsynch(PPDMDDISPLAYVBVACALLBACKS pInterface, PVBOXVHWACMD pCmd);
+
+int vbvaVHWAConstruct (PVGASTATE pVGAState);
+int vbvaVHWADisable (PVGASTATE pVGAState);
+int vbvaVHWASaveStatePrep (PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
+int vbvaVHWASaveStateExec (PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
+int vbvaVHWALoadStateExec (PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
 # endif
 #endif /* VBOX_WITH_HGSMI */