Changeset 22794 in vbox for trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h

Timestamp:

Sep 5, 2009 7:31:56 PM (15 years ago)

Author:

vboxsync

Message:

video 2d accel: first step to make ogl be used only when overlay is enabled, bugfixes

File:

• trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h (modified) (10 diffs)

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

@@ -420 +420 @@
     const QRect & rect() const {return mRect;}
 
+    const QRect & toRect()
+    {
+        if(isClear())
+        {
+            mRect.setCoords(0, 0, -1, -1);
+        }
+        return mRect;
+    }
+
     bool intersects(const QRect & aRect) const {return mIsClear ? false : mRect.intersects(aRect);}
 
@@ -665 +674 @@
             bool aIsYInverted,
 #endif
-            const QSize * aSize, const QSize * aTargetSize,
+            const QSize & aSize,
+            const QRect & aTargRect,
+            const QRect & aSrcRect,
+            const QRect & aVisTargRect,
             VBoxVHWAColorFormat & aColorFormat,
             VBoxVHWAColorKey * pSrcBltCKey, VBoxVHWAColorKey * pDstBltCKey,
@@ -689 +701 @@
     void performDisplay(VBoxVHWASurfaceBase *pPrimary);
 
-    void setRects(VBoxVHWASurfaceBase *pPrimary, const QRect * aTargRect, const QRect * aSrcRect);
-    void setTargetRectPosition(VBoxVHWASurfaceBase *pPrimary, const QPoint * aPoint);
+    void setRects(VBoxVHWASurfaceBase *pPrimary, const QRect & aTargRect, const QRect & aSrcRect, const QRect & aVisibleTargRect, bool bForceReinit);
+    void setTargRectPosition(VBoxVHWASurfaceBase *pPrimary, const QPoint & aPoint, const QRect & aVisibleTargRect);
+    void updateVisibleTargRect(VBoxVHWASurfaceBase *pPrimary, const QRect & aVisibleTargRect);
 
     static ulong calcBytesPerPixel(GLenum format, GLenum type);
@@ -824 +837 @@
     static int setCKey(class VBoxVHWAGlProgramVHWA * pProgram, const VBoxVHWAColorFormat * pFormat, const VBoxVHWAColorKey * pCKey, bool bDst);
 
-    uint32_t handle() {return mHGHandle;}
+    uint32_t handle() const {return mHGHandle;}
     void setHandle(uint32_t h) {mHGHandle = h;}
-private:
+
+private:
+    void doSetRectValuesInternal(const QRect & aTargRect, const QRect & aSrcRect, const QRect & aVisTargRect);
+
     void setComplexList(VBoxVHWASurfList *aComplexList) { mComplexList = aComplexList; }
     void initDisplay(VBoxVHWASurfaceBase *pPrimary);
@@ -845 +861 @@
     QRect mSrcRect;
     QRect mTargRect; /* == Vis FB size */
-    QRect mTargSize;
+
+    QRect mVisibleTargRect;
+    QRect mVisibleSrcRect;
 
     GLuint mVisibleDisplay;
@@ -1026 +1044 @@
 
     const OverlayList & overlays() const {return mOverlays;}
+    const VBoxVHWASurfList & primaries() const { return mPrimary; }
 
 private:
@@ -1202 +1221 @@
     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() : 0; }
-
-    void vboxPaintEvent (QPaintEvent *pe) {vboxPerformGLOp(&VBoxGLWidget::vboxDoPaint, pe); }
-    void vboxResizeEvent (VBoxResizeEvent *re) {vboxPerformGLOp(&VBoxGLWidget::vboxDoResize, re); }
-
-    void vboxProcessVHWACommands(class VBoxVHWACommandProcessEvent * pEvent) {vboxPerformGLOp(&VBoxGLWidget::vboxDoProcessVHWACommands, pEvent);}
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    void vboxVHWACmd (struct _VBOXVHWACMD * pCmd) {vboxPerformGLOp(&VBoxGLWidget::vboxDoVHWACmd, pCmd);}
-#endif
-    class VBoxVHWAGlProgramMngr * vboxVHWAGetGlProgramMngr() { return mpMngr; }
-
-    VBoxVHWASurfaceBase * vboxGetVGASurface() { return mDisplay.getVGA(); }
-
-    void postCmd(VBOXVHWA_PIPECMD_TYPE aType, void * pvData);
-
-    static void doSetupMatrix(const QSize & aSize, bool bInverted);
-protected:
-
-    void paintGL()
-    {
-        if(mpfnOp)
-        {
-            (this->*mpfnOp)(mOpContext);
-            mpfnOp = NULL;
-        }
-        else
-        {
-            mDisplay.performDisplay();
-        }
-    }
-
-    void initializeGL();
-private:
-    static void setupMatricies(const QSize &display);
-    static void adjustViewport(const QSize &display, const QRect &viewport);
-    void vboxDoResize(void *re);
-    void vboxDoPaint(void *rec);
-
-    void vboxDoUpdateRect(const QRect * pRect);
-#ifdef VBOXQGL_DBG_SURF
-    void vboxDoTestSurfaces(void *context);
-#endif
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    void vboxDoVHWACmdExec(void *cmd);
-    void vboxDoVHWACmdAndFree(void *cmd);
-    void vboxDoVHWACmd(void *cmd);
-
-    void vboxCheckUpdateAddress (VBoxVHWASurfaceBase * pSurface, uint64_t offset)
-    {
-        if (pSurface->addressAlocated())
-        {
-            uchar * addr = vboxVRAMAddressFromOffset(offset);
-            if(addr)
-            {
-                pSurface->setAddress(addr);
-            }
-        }
-    }
+
     int vhwaSurfaceCanCreate(struct _VBOXVHWACMD_SURF_CANCREATE *pCmd);
     int vhwaSurfaceCreate(struct _VBOXVHWACMD_SURF_CREATE *pCmd);
@@ -1277 +1236 @@
     int vhwaConstruct(struct _VBOXVHWACMD_HH_CONSTRUCT *pCmd);
 
+    bool hasSurfaces() const;
+    bool hasVisibleOverlays();
+    const QRect & overlaysRectUnion();
+#endif
+
+    ulong vboxBitsPerPixel() { return mDisplay.getVGA()->bitsPerPixel(); }
+    ulong vboxBytesPerLine() { return mDisplay.getVGA() ? mDisplay.getVGA()->bytesPerLine() : 0; }
+
+//    void vboxPaintEvent (QPaintEvent *pe) {vboxPerformGLOp(&VBoxGLWidget::vboxDoPaint, pe); }
+    void vboxResizeEvent (VBoxResizeEvent *re) {vboxPerformGLOp(&VBoxGLWidget::vboxDoResize, re); }
+
+    void vboxProcessVHWACommands(class VBoxVHWACommandProcessEvent * pEvent) {vboxPerformGLOp(&VBoxGLWidget::vboxDoProcessVHWACommands, pEvent);}
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    void vboxVHWACmd (struct _VBOXVHWACMD * pCmd) {vboxPerformGLOp(&VBoxGLWidget::vboxDoVHWACmd, pCmd);}
+#endif
+    class VBoxVHWAGlProgramMngr * vboxVHWAGetGlProgramMngr() { return mpMngr; }
+
+    VBoxVHWASurfaceBase * vboxGetVGASurface() { return mDisplay.getVGA(); }
+
+    void postCmd(VBOXVHWA_PIPECMD_TYPE aType, void * pvData);
+
+    static void doSetupMatrix(const QSize & aSize, bool bInverted);
+
+    void vboxDoUpdateViewport(const QRect * pRect);
+    const QRect & vboxViewport() const {return mViewport;}
+
+    void performDisplay() { mDisplay.performDisplay(); }
+protected:
+
+    void paintGL()
+    {
+        if(mpfnOp)
+        {
+            (this->*mpfnOp)(mOpContext);
+            mpfnOp = NULL;
+        }
+//        else
+//        {
+            mDisplay.performDisplay();
+//        }
+    }
+
+    void initializeGL();
+
+private:
+    static void setupMatricies(const QSize &display);
+    static void adjustViewport(const QSize &display, const QRect &viewport);
+    void vboxDoResize(void *re);
+//    void vboxDoPaint(void *rec);
+
+
+    void vboxDoUpdateRect(const QRect * pRect);
+#ifdef VBOXQGL_DBG_SURF
+    void vboxDoTestSurfaces(void *context);
+#endif
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    void vboxDoVHWACmdExec(void *cmd);
+    void vboxDoVHWACmdAndFree(void *cmd);
+    void vboxDoVHWACmd(void *cmd);
+
+    void vboxCheckUpdateAddress (VBoxVHWASurfaceBase * pSurface, uint64_t offset)
+    {
+        if (pSurface->addressAlocated())
+        {
+            uchar * addr = vboxVRAMAddressFromOffset(offset);
+            if(addr)
+            {
+                pSurface->setAddress(addr);
+            }
+        }
+    }
+
     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, bool bVisible);
     int vhwaLoadOverlayData(struct SSMHANDLE * pSSM, uint32_t u32Version);
-
     void vhwaDoSurfaceOverlayUpdate(VBoxVHWASurfaceBase *pDstSurf, VBoxVHWASurfaceBase *pSrcSurf, struct _VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmd);
 #endif
@@ -1292 +1322 @@
      * submit the operation to be performed
      * @todo: could be moved outside the updateGL */
-    void vboxPerformGLOp(PFNVBOXQGLOP pfn, void* pContext) {mpfnOp = pfn; mOpContext = pContext; updateGL();}
+    void vboxPerformGLOp(PFNVBOXQGLOP pfn, void* pContext)
+    {
+        mpfnOp = pfn;
+        mOpContext = pContext;
+        updateGL();
+    }
 
 //    /* posts op to UI thread */
@@ -1380 +1415 @@
 };
 
+#ifdef VBOX_WITH_VIDEOHWACCEL
+class VBoxQGLOverlayFrameBuffer : public VBoxQImageFrameBuffer
+{
+public:
+    VBoxQGLOverlayFrameBuffer (VBoxConsoleView *aView);
+
+
+    STDMETHOD(ProcessVHWACommand)(BYTE *pCommand);
+
+    void doProcessVHWACommand(QEvent * pEvent);
+
+    STDMETHOD(NotifyUpdate) (ULONG aX, ULONG aY,
+                             ULONG aW, ULONG aH);
+
+    void paintEvent (QPaintEvent *pe);
+    void resizeEvent (VBoxResizeEvent *re);
+
+    void vboxUpdateRect(const QRect * pRect);
+private:
+    void vboxSetGlOn(bool on);
+    bool vboxGetGlOn() { return mGlOn; }
+    void vboxSynchGl();
+    void vboxDoVHWACmdExec(void *cmd);
+    void vboxShowOverlay(bool show);
+    void vboxUpdateOverlayPosition(const QPoint & pos);
+    void vboxUpdateOverlay(const QPoint & pos, const QRect & rect, bool show);
+    VBoxGLWidget *mpOverlayWidget;
+    bool mGlOn;
+    bool mOverlayVisible;
+    VBoxVHWADirtyRect mMainDirtyRect;
+};
+#endif
 
 #endif