Changeset 22215 in vbox for trunk/src/VBox/Frontends

Timestamp:

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

Author:

vboxsync

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

51016

Message:

video hw accel: basics for saved state support

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• include/VBoxFrameBuffer.h (modified) (12 diffs)

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;