Changeset 22846 in vbox for trunk/src/VBox/Frontends/VirtualBox/include/VBoxFBOverlay.h

Timestamp:

Sep 8, 2009 7:33:55 PM (15 years ago)

Author:

vboxsync

Message:

video hw accel: overlay update fixes

File:

• trunk/src/VBox/Frontends/VirtualBox/include/VBoxFBOverlay.h (modified) (13 diffs)

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

@@ -431 +431 @@
     void updatedMem(const QRect * aRect);
 
-    void performDisplay(VBoxVHWASurfaceBase *pPrimary);
+    bool performDisplay(VBoxVHWASurfaceBase *pPrimary, bool bForce);
 
     void setRects(VBoxVHWASurfaceBase *pPrimary, const QRect & aTargRect, const QRect & aSrcRect, const QRect & aVisibleTargRect, bool bForceReinit);
@@ -583 +583 @@
     GLuint createDisplay(VBoxVHWASurfaceBase *pPrimary);
     void doDisplay(VBoxVHWASurfaceBase *pPrimary, VBoxVHWAGlProgramVHWA * pProgram, bool bBindDst);
-    void synchTexMem(const QRect * aRect);
+    bool synchTexMem(const QRect * aRect);
 
     int performBlt(const QRect * pDstRect, VBoxVHWASurfaceBase * pSrcSurface, const QRect * pSrcRect, const VBoxVHWAColorKey * pDstCKey, const VBoxVHWAColorKey * pSrcCKey, bool blt);
@@ -772 +772 @@
     }
 
-    void performDisplay()
+    bool performDisplay(bool bForce)
     {
         VBoxVHWASurfaceBase * pPrimary = mPrimary.current();
-        pPrimary->performDisplay(NULL);
+        bForce |= pPrimary->performDisplay(NULL, bForce);
 
         for (OverlayList::const_iterator it = mOverlays.begin();
@@ -783 +783 @@
             if(pOverlay)
             {
-                pOverlay->performDisplay(pPrimary);
+                bForce |= pOverlay->performDisplay(pPrimary, bForce);
             }
         }
+        return bForce;
     }
 
@@ -1061 +1062 @@
     const QRect & vboxViewport() const {return mViewport;}
 
-    void performDisplay() { mDisplay.performDisplay(); }
+    bool performDisplay(bool bForce) { return mDisplay.performDisplay(bForce); }
 protected:
 
@@ -1073 +1074 @@
 //        else
 //        {
-            mDisplay.performDisplay();
+            mDisplay.performDisplay(true);
 //        }
     }
@@ -1165 +1166 @@
 
 
-typedef enum
-{
-    VBOXFBOVERLAY_DONE = 1,
-    VBOXFBOVERLAY_MODIFIED,
-    VBOXFBOVERLAY_UNTOUCHED
-} VBOXFBOVERLAY_RESUT;
+//typedef enum
+//{
+//    VBOXFBOVERLAY_DONE = 1,
+//    VBOXFBOVERLAY_MODIFIED,
+//    VBOXFBOVERLAY_UNTOUCHED
+//} VBOXFBOVERLAY_RESUT;
 
 class VBoxQGLOverlay
@@ -1201 +1202 @@
     }
 
-    VBOXFBOVERLAY_RESUT onPaintEvent (const QPaintEvent *pe, QRect *pRect);
+//    VBOXFBOVERLAY_RESUT onPaintEvent (const QPaintEvent *pe, QRect *pRect);
+
     void onResizeEvent (const class VBoxResizeEvent *re);
     void onResizeEventPostprocess (const class VBoxResizeEvent *re);
 
-    void viewportResized(QResizeEvent * re)
+    void onViewportResized(QResizeEvent * re)
     {
         vboxDoCheckUpdateViewport();
@@ -1211 +1213 @@
     }
 
-    void viewportScrolled(int dx, int dy)
+    void onViewportScrolled(int dx, int dy)
     {
         vboxDoCheckUpdateViewport();
@@ -1257 +1259 @@
 #else
             makeCurrent();
-            mpOverlayWidget->performDisplay();
+            mpOverlayWidget->performDisplay(false);
             mpOverlayWidget->swapBuffers();
 #endif
@@ -1350 +1352 @@
     }
 
-    void paintEvent (QPaintEvent *pe)
-    {
-        QRect rect;
-        VBOXFBOVERLAY_RESUT res = mOverlay.onPaintEvent(pe, &rect);
-        switch(res)
-        {
-            case VBOXFBOVERLAY_MODIFIED:
-            {
-                QPaintEvent modified(rect);
-                T::paintEvent(&modified);
-            } break;
-            case VBOXFBOVERLAY_UNTOUCHED:
-                T::paintEvent(pe);
-                break;
-            default:
-                break;
-        }
-    }
+//    void paintEvent (QPaintEvent *pe)
+//    {
+//        QRect rect;
+//        VBOXFBOVERLAY_RESUT res = mOverlay.onPaintEvent(pe, &rect);
+//        switch(res)
+//        {
+//            case VBOXFBOVERLAY_MODIFIED:
+//            {
+//                QPaintEvent modified(rect);
+//                T::paintEvent(&modified);
+//            } break;
+//            case VBOXFBOVERLAY_UNTOUCHED:
+//                T::paintEvent(pe);
+//                break;
+//            default:
+//                break;
+//        }
+//    }
 
     void resizeEvent (VBoxResizeEvent *re)
@@ -1378 +1380 @@
     void viewportResized(QResizeEvent * re)
     {
-        mOverlay.viewportResized(re);
+        mOverlay.onViewportResized(re);
         T::viewportResized(re);
     }
@@ -1384 +1386 @@
     void viewportScrolled(int dx, int dy)
     {
-        mOverlay.viewportScrolled(dx, dy);
+        mOverlay.onViewportScrolled(dx, dy);
         T::viewportScrolled(dx, dy);
     }