Changeset 22846 in vbox

Timestamp:

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

Author:

vboxsync

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

52082

Message:

video hw accel: overlay update fixes

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxFBOverlay.h (modified) (13 diffs)
• src/VBoxFBOverlay.cpp (modified) (15 diffs)
• src/VBoxFBQGL.cpp (modified) (1 diff)

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);
     }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -2147 +2147 @@
 GLenum VBoxVHWATextureNP2Rect::texTarget() {return GL_TEXTURE_RECTANGLE; }
 
-void VBoxVHWASurfaceBase::synchTexMem(const QRect * pRect)
+bool VBoxVHWASurfaceBase::synchTexMem(const QRect * pRect)
 {
     if(pRect)
@@ -2155 +2155 @@
 
     if(mUpdateMem2TexRect.isClear())
-        return;
+        return false;
 
     if(pRect && !mUpdateMem2TexRect.rect().intersects(*pRect))
-        return;
+        return false;
 
     mpTex[0]->update(&mUpdateMem2TexRect.rect());
@@ -2179 +2179 @@
 //    VBOXPRINTDIF(dbgTime, ("texMem:"));
 //#endif
+    return true;
 }
 
@@ -2870 +2871 @@
 //}
 
-void VBoxVHWASurfaceBase::performDisplay(VBoxVHWASurfaceBase *pPrimary)
+bool VBoxVHWASurfaceBase::performDisplay(VBoxVHWASurfaceBase *pPrimary, bool bForce)
 {
     Assert(mVisibleDisplayInitialized);
@@ -2879 +2880 @@
         Assert(mVisibleSrcRect.isEmpty());
         Assert(mVisibleTargRect.isEmpty());
-        return;
+        return false;
     }
     else
@@ -2887 +2888 @@
     }
 
-    synchTexMem(&mVisibleSrcRect);
+    bForce |= synchTexMem(&mVisibleSrcRect);
     if(pPrimary && getActiveDstOverlayCKey(pPrimary))
     {
-        pPrimary->synchTexMem(&mVisibleTargRect);
-    }
+        bForce |= pPrimary->synchTexMem(&mVisibleTargRect);
+    }
+
+    if(!bForce)
+        return false;
 
 #ifdef DEBUG_misha
@@ -2924 +2928 @@
                 );
     }
+
+    Assert(bForce);
+    return true;
 }
 
@@ -5165 +5172 @@
 }
 
-VBOXFBOVERLAY_RESUT VBoxQGLOverlay::onPaintEvent (const QPaintEvent *pe, QRect *pRect)
-{
-    Q_UNUSED(pe);
-    Q_UNUSED(pRect);
-
-//    if(mOverlayWidgetVisible && !mProcessingCommands)
-//    {
-//        Assert(!mGlCurrent);
-//        vboxDoCheckUpdateViewport();
-//        vboxOpExit();
-//    }
-    return VBOXFBOVERLAY_UNTOUCHED;
-}
+//VBOXFBOVERLAY_RESUT VBoxQGLOverlay::onPaintEvent (const QPaintEvent *pe, QRect *pRect)
+//{
+//    Q_UNUSED(pe);
+//    Q_UNUSED(pRect);
+//
+////    if(mOverlayWidgetVisible && !mProcessingCommands)
+////    {
+////        Assert(!mGlCurrent);
+////        vboxDoCheckUpdateViewport();
+////        vboxOpExit();
+////    }
+//    return VBOXFBOVERLAY_UNTOUCHED;
+//}
 
 void VBoxQGLOverlay::onResizeEvent (const VBoxResizeEvent *re)
@@ -5391 +5398 @@
     {
         mpOverlayWidget->vboxDoUpdateRect(&aRect);
-        if(aRect.intersects(mpOverlayWidget->vboxViewport()))
-        {
-            mNeedOverlayRepaint = true;
-        }
+        mNeedOverlayRepaint = true;
     }
 }
@@ -5403 +5407 @@
     VBoxVHWASurfaceBase * pVGA = mpOverlayWidget->vboxGetVGASurface();
     const VBoxVHWADirtyRect & rect = pVGA->getDirtyRect();
+    mNeedOverlayRepaint = true;
     if(!rect.isClear())
     {
@@ -5438 +5443 @@
                 }
                 vboxDoCheckUpdateViewport();
+                mNeedOverlayRepaint = true;
             }
         } break;
@@ -5456 +5462 @@
                 }
                 vboxDoCheckUpdateViewport();
+                mNeedOverlayRepaint = true;
             }
         } break;
@@ -5472 +5479 @@
             VBOXVHWACMD_SURF_BLT * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_BLT);
             pCmd->rc = mpOverlayWidget->vhwaSurfaceBlt(pBody);
+            mNeedOverlayRepaint = true;
         } break;
         case VBOXVHWACMD_TYPE_SURF_FLIP:
@@ -5489 +5497 @@
             }
             vboxDoCheckUpdateViewport();
+            mNeedOverlayRepaint = true;
         } break;
         case VBOXVHWACMD_TYPE_SURF_OVERLAY_SETPOSITION:
@@ -5500 +5509 @@
             }
             vboxDoCheckUpdateViewport();
+            mNeedOverlayRepaint = true;
         } break;
         case VBOXVHWACMD_TYPE_SURF_COLORKEY_SET:

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBQGL.cpp

@@ -130 +130 @@
     }
 
-    pw->performDisplay();
+    pw->performDisplay(true);
 
     pw->swapBuffers();