Changeset 22215 in vbox

Timestamp:

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

Author:

vboxsync

Message:

video hw accel: basics for saved state support

Location:

trunk

Files:

• include/VBox/VBoxVideo.h (modified) (5 diffs)
• src/VBox/Devices/Graphics/DevVGA.cpp (modified) (4 diffs)
• src/VBox/Devices/Graphics/DevVGA.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h (modified) (12 diffs)
• src/VBox/Main/DisplayImpl.cpp (modified) (2 diffs)

trunk/include/VBox/VBoxVideo.h

@@ -257 +257 @@
 #define VBOXVHWA_VERSION_MAJ 0
 #define VBOXVHWA_VERSION_MIN 0
-#define VBOXVHWA_VERSION_BLD 1
+#define VBOXVHWA_VERSION_BLD 2
 #define VBOXVHWA_VERSION_RSV 0
 
@@ -275 +275 @@
     VBOXVHWACMD_TYPE_QUERY_INFO2,
     VBOXVHWACMD_TYPE_ENABLE,
-    VBOXVHWACMD_TYPE_DISABLE
+    VBOXVHWACMD_TYPE_DISABLE,
+    VBOXVHWACMD_TYPE_HH_CONSTRUCT
 } VBOXVHWACMD_TYPE;
 
@@ -291 +292 @@
 /* the host has copied the VBOXVHWACMD_FLAG_GH_ASYNCH_NOCOMPLETION command and returned it to the guest */
 #define VBOXVHWACMD_FLAG_HG_ASYNCH_RETURNED      0x00020000
+/* this is the host->host cmd, i.e. a configuration command posted by the host to the framebuffer */
+#define VBOXVHWACMD_FLAG_HH_CMD                  0x10000000
 
 typedef struct _VBOXVHWACMD
@@ -300 +303 @@
     uint64_t GuestVBVAReserved1; /* field internally used by the guest VBVA cmd handling, must NOT be modified by clients */
     uint64_t GuestVBVAReserved2; /* field internally used by the guest VBVA cmd handling, must NOT be modified by clients */
+    volatile uint32_t cRefs;
+    int32_t Reserved;
     union
     {
@@ -729 +734 @@
     } u;
 } VBOXVHWACMD_SURF_OVERLAY_SETPOSITION;
+
+typedef struct _VBOXVHWACMD_HH_CONSTRUCT
+{
+    void * pVM;
+} VBOXVHWACMD_HH_CONSTRUCT;
 
 #pragma pack()

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 */

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -203 +203 @@
 VirtualBox_LIBS = $(LIB_DDU)
 
+ifdef VBOX_WITH_VIDEOHWACCEL
+# Necessary for save state support
+VirtualBox_LIBS += $(LIB_VMM)
+endif
 ifeq ($(KBUILD_TYPE),release)
  VirtualBox_LDFLAGS.win  += /SUBSYSTEM:windows

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

@@ -640 +640 @@
     uint32_t widthCompression() const {return mWidthCompression;}
     uint32_t heightCompression() const {return mHeightCompression;}
-//    uint32_t r(uint32_t pix);
-//    uint32_t g(uint32_t pix);
-//    uint32_t b(uint32_t pix);
+    const VBoxVHWAColorComponent& r() const {return mR;}
+    const VBoxVHWAColorComponent& g() const {return mG;}
+    const VBoxVHWAColorComponent& b() const {return mB;}
+    const VBoxVHWAColorComponent& a() const {return mA;}
 
 private:
@@ -1033 +1034 @@
     VBoxVHWAColorKey mDefaultSrcOverlayCKey;
 
-
-//    GLenum mFormat;
-//    GLint  mInternalFormat;
-//    GLenum mType;
-//    ulong  mDisplayWidth;
-//    ulong  mDisplayHeight;
-//    ulong  mBytesPerPixel;
-//    ulong  mBytesPerLine;
-
     int mLockCount;
     /* memory buffer not reflected in fm and texture, e.g if memory buffer is replaced or in case of lock/unlock  */
@@ -1078 +1070 @@
 
 typedef std::list <VBoxVHWASurfaceBase*> SurfList;
+typedef std::list <VBoxVHWASurfList*> OverlayList;
 
 class VBoxVHWASurfList
@@ -1198 +1191 @@
     }
 
-
     void performDisplay()
     {
@@ -1211 +1203 @@
             {
                 pOverlay->performDisplay(pPrimary);
-//                pPrimary->overlay(pOverlay);
             }
         }
     }
+
+    const OverlayList & overlays() const {return mOverlays;}
 
 private:
@@ -1220 +1213 @@
     VBoxVHWASurfList mPrimary;
 
-    typedef std::list <VBoxVHWASurfList*> OverlayList;
-
     OverlayList mOverlays;
 };
@@ -1235 +1226 @@
 
     uchar *vboxAddress() { return mDisplay.getVGA() ? mDisplay.getVGA()->address() : NULL; }
+
 #ifdef VBOX_WITH_VIDEOHWACCEL
     uchar *vboxVRAMAddressFromOffset(uint64_t offset);
-#endif
+
+    void vhwaSaveExec(struct SSMHANDLE * pSSM);
+    int vhwaLoadExec(struct SSMHANDLE * pSSM, uint32_t u32Version);
+#endif
+
     ulong vboxBitsPerPixel() { return mDisplay.getVGA()->bitsPerPixel(); }
     ulong vboxBytesPerLine() { return mDisplay.getVGA() ? mDisplay.getVGA()->bytesPerLine() : NULL; }
 
 typedef void (VBoxGLWidget::*PFNVBOXQGLOP)(void* );
-//typedef FNVBOXQGLOP *PFNVBOXQGLOP;
 
     void vboxPaintEvent (QPaintEvent *pe) {vboxPerformGLOp(&VBoxGLWidget::vboxDoPaint, pe);}
     void vboxResizeEvent (VBoxResizeEvent *re) {vboxPerformGLOp(&VBoxGLWidget::vboxDoResize, re);}
-//#ifdef VBOXQGL_DBG_SURF
-//    void vboxTestSurfaces () {vboxPerformGLOp(&VBoxGLWidget::vboxDoTestSurfaces, NULL);}
-//#endif
+
     void vboxProcessVHWACommands(VBoxVHWACommandProcessEvent * pEvent) {vboxPerformGLOp(&VBoxGLWidget::vboxDoProcessVHWACommands, pEvent);}
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -1259 +1252 @@
     void postCmd(VBOXVHWA_PIPECMD_TYPE aType, void * pvData);
 protected:
-//    void resizeGL (int height, int width);
 
     void paintGL()
     {
-//        Assert(mState.getCurrent() == NULL);
-//        /* we are called with QGLWidget context */
-//        mState.assertCurrent(mDisplay.getVGA(), false);
         if(mpfnOp)
         {
@@ -1275 +1264 @@
             mDisplay.performDisplay();
         }
-//        /* restore the context */
-//        mState.makeCurrent(mDisplay.getVGA());
-//        /* clear*/
-//        mState.assertCurrent(NULL, false);
     }
 
     void initializeGL();
 private:
-//    void vboxDoInitDisplay();
-//    void vboxDoDeleteDisplay();
-//    void vboxDoPerformDisplay() { Assert(mDisplayInitialized); glCallList(mDisplay); }
     void vboxDoResize(void *re);
     void vboxDoPaint(void *rec);
@@ -1324 +1306 @@
     int vhwaQueryInfo1(struct _VBOXVHWACMD_QUERYINFO1 *pCmd);
     int vhwaQueryInfo2(struct _VBOXVHWACMD_QUERYINFO2 *pCmd);
+    int vhwaConstruct(struct _VBOXVHWACMD_HH_CONSTRUCT *pCmd);
+
+    int vhwaSaveSurface(struct SSMHANDLE * pSSM, VBoxVHWASurfaceBase *pSurf, uint32_t surfCaps);
+    int vhwaLoadSurface(struct SSMHANDLE * pSSM, uint32_t u32Version);
+    int vhwaSaveOverlayData(struct SSMHANDLE * pSSM, VBoxVHWASurfaceBase *pSurf);
+    int vhwaLoadOverlayData(struct SSMHANDLE * pSSM, uint32_t u32Version);
 
     void vhwaDoSurfaceOverlayUpdate(VBoxVHWASurfaceBase *pDstSurf, VBoxVHWASurfaceBase *pSrcSurf, struct _VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmd);
@@ -1329 +1317 @@
     static const QGLFormat & vboxGLFormat();
 
-//    VBoxVHWASurfaceQGL * pDisplay;
     VBoxVHWADisplay mDisplay;
 
 
-    /* we need to do all opengl stuff in the paintGL context,
-     * submit the operation to be performed */
+    /* we do all opengl stuff in the paintGL context,
+     * submit the operation to be performed
+     * @todo: could be moved outside the updateGL */
     void vboxPerformGLOp(PFNVBOXQGLOP pfn, void* pContext) {mpfnOp = pfn; mOpContext = pContext; updateGL();}
 
@@ -1347 +1335 @@
     void *mOpContext;
 
-//    ulong  mBitsPerPixel;
     ulong  mPixelFormat;
     bool   mUsesGuestVRAM;
-#if 0
-    VBoxVHWAGlContextState mState;
-#endif
+    bool   mVGASurfCreated;
 
     RTCRITSECT mCritSect;

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -2349 +2349 @@
         if(FAILED(hr))
         {
-            rc = VERR_GENERAL_FAILURE;
+            rc = (hr == E_NOTIMPL) ? VERR_NOT_IMPLEMENTED : VERR_GENERAL_FAILURE;
         }
 
@@ -2363 +2363 @@
     {
         /* tell the guest the command is complete */
+        pCommand->Flags &= (~VBOXVHWACMD_FLAG_HG_ASYNCH);
         pCommand->rc = rc;
     }