Changeset 34461 in vbox

Timestamp:

Nov 29, 2010 1:13:03 PM (14 years ago)

Author:

vboxsync

Message:

2d: fix & optimize RGB data playback

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (10 diffs)
• VBoxFBOverlay.h (modified) (4 diffs)
• VBoxFBOverlayCommon.h (modified) (1 diff)

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

@@ -322 +322 @@
 static VBoxVHWATextureImage* vboxVHWAImageCreate(const QRect & aRect, const VBoxVHWAColorFormat & aFormat, class VBoxVHWAGlProgramMngr * pMgr, VBOXVHWAIMG_TYPE flags)
 {
+    bool bCanLinearNonFBO = false;
+    if (!aFormat.fourcc())
+    {
+        flags &= ~VBOXVHWAIMG_FBO;
+        bCanLinearNonFBO = true;
+    }
+
     const VBoxVHWAInfo & info = vboxVHWAGetSupportInfo(NULL);
     if((flags & VBOXVHWAIMG_PBO) && !info.getGlInfo().isPBOSupported())
@@ -337 +344 @@
         flags &= ~VBOXVHWAIMG_PBO;
 
-    if(flags & VBOXVHWAIMG_PBOIMG)
-    {
-        if(flags & VBOXVHWAIMG_FBO)
+    if(flags & VBOXVHWAIMG_FBO)
+    {
+        if(flags & VBOXVHWAIMG_PBOIMG)
         {
             VBOXQGLLOG(("FBO PBO Image\n"));
             return new VBoxVHWATextureImageFBO<VBoxVHWATextureImagePBO>(aRect, aFormat, pMgr, flags);
         }
+        VBOXQGLLOG(("FBO Generic Image\n"));
+        return new VBoxVHWATextureImageFBO<VBoxVHWATextureImage>(aRect, aFormat, pMgr, flags);
+    }
+
+    if (!bCanLinearNonFBO)
+    {
+        VBOXQGLLOG(("Disabling Linear stretching\n"));
+        flags &= ~VBOXVHWAIMG_LINEAR;
+    }
+
+    if(flags & VBOXVHWAIMG_PBOIMG)
+    {
         VBOXQGLLOG(("PBO Image\n"));
         return new VBoxVHWATextureImagePBO(aRect, aFormat, pMgr, flags);
     }
-    if(flags & VBOXVHWAIMG_FBO)
-    {
-        VBOXQGLLOG(("FBO Generic Image\n"));
-        return new VBoxVHWATextureImageFBO<VBoxVHWATextureImage>(aRect, aFormat, pMgr, flags);
-    }
+
     VBOXQGLLOG(("Generic Image\n"));
     return new VBoxVHWATextureImage(aRect, aFormat, pMgr, flags);
@@ -1469 +1484 @@
 }
 
+#ifdef DEBUG_misha
+void VBoxVHWATexture::dbgDump()
+{
+#if 0
+    bind();
+    GLvoid *pvBuf = malloc(4 * mRect.width() * mRect.height());
+    VBOXQGL_CHECKERR(
+        glGetTexImage(texTarget(),
+            0, /*GLint level*/
+            mColorFormat.format(),
+            mColorFormat.type(),
+            pvBuf);
+    );
+    VBOXQGLDBGPRINT(("<?dml?><exec cmd=\"!vbvdbg.ms 0x%p 0n%d 0n%d\">texture info</exec>\n",
+            pvBuf, mRect.width(), mRect.height()));
+    Assert(0);
+
+    free(pvBuf);
+#endif
+}
+#endif
+
+
 void VBoxVHWATexture::initParams()
 {
@@ -2301 +2339 @@
         if(!bNoPBO)
         {
-            fFlags |= VBOXVHWAIMG_PBO | VBOXVHWAIMG_PBOIMG;
+            fFlags |= VBOXVHWAIMG_PBO | VBOXVHWAIMG_PBOIMG | VBOXVHWAIMG_LINEAR;
             if(mSettings->isStretchLinearEnabled())
                 fFlags |= VBOXVHWAIMG_FBO;
@@ -3812 +3850 @@
             0,
 #endif
-            0);
+            0 /* VBOXVHWAIMG_TYPE fFlags */);
     pDisplay->init(NULL, bUsesGuestVram ? size.VRAM() : NULL);
     mDisplay.setVGA(pDisplay);
@@ -5468 +5506 @@
             || *pDstRect != mDstRect
             || *pSrcRect != mSrcRect
-            || !!(pDstRect) != !!(mpDstCKey)
+            || !!(pDstCKey) != !!(mpDstCKey)
             || !!(pSrcCKey) != !!(mpSrcCKey)
-            || mbNotIntersected != bNotIntersected)
+            || mbNotIntersected != bNotIntersected
+            || mpProgram != calcProgram(pDst, pDstCKey, pSrcCKey, bNotIntersected))
     {
         return createSetDisplay(pDst, pDstRect, pSrcRect,
@@ -5476 +5515 @@
 
     }
-    else if((pDstCKey && mpDstCKey && *pDstCKey == *mpDstCKey)
-            || (pSrcCKey && mpSrcCKey && *pSrcCKey == *mpSrcCKey))
+    else if((pDstCKey && mpDstCKey && *pDstCKey != *mpDstCKey)
+            || (pSrcCKey && mpSrcCKey && *pSrcCKey != *mpSrcCKey))
     {
         Assert(mpProgram);
@@ -5483 +5522 @@
         return VINF_SUCCESS;
     }
-    mVisibleDisplay = 0;
-    mpProgram = 0;
     return VINF_SUCCESS;
 }
@@ -5681 +5718 @@
 void VBoxVHWATextureImage::display()
 {
+#ifdef DEBUG_misha
+    if (mpDst)
+    {
+        dbgDump();
+    }
+
+    static bool bDisplayOn = true;
+#endif
     Assert(mVisibleDisplay);
-    if(mVisibleDisplay)
+    if(mVisibleDisplay
+#ifdef DEBUG_misha
+            && bDisplayOn
+#endif
+            )
     {
         if(mpProgram)
@@ -5700 +5749 @@
     }
 }
+
+#ifdef DEBUG_misha
+void VBoxVHWATextureImage::dbgDump()
+{
+    for (uint32_t i = 0; i < mcTex; ++i)
+    {
+        mpTex[i]->dbgDump();
+    }
+}
+#endif
 
 int VBoxVHWATextureImage::setCKey (VBoxVHWAGlProgramVHWA * pProgram, const VBoxVHWAColorFormat * pFormat, const VBoxVHWAColorKey * pCKey, bool bDst)

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

@@ -186 +186 @@
 
     bool operator==(const VBoxVHWAColorKey & other) const { return mUpper == other.mUpper && mLower == other.mLower; }
+    bool operator!=(const VBoxVHWAColorKey & other) const { return !(*this == other); }
 private:
     uint32_t mUpper;
@@ -318 +319 @@
     ulong memSize(){ return mBytesPerLine * mRect.height(); }
     uint32_t bytesPerLine() {return mBytesPerLine; }
+#ifdef DEBUG_misha
+    void dbgDump();
+#endif
 
 protected:
@@ -525 +529 @@
     const VBoxVHWAColorKey* srcCKey() { return mpSrcCKey; }
     bool notIntersectedMode() { return mbNotIntersected; }
+
+#ifdef DEBUG_misha
+    void dbgDump();
+#endif
+
 protected:
     static int setCKey(class VBoxVHWAGlProgramVHWA * pProgram, const VBoxVHWAColorFormat * pFormat, const VBoxVHWAColorKey * pCKey, bool bDst);
@@ -1714 +1723 @@
 public:
     VBoxVHWATextureImageFBO(const QRect &size, const VBoxVHWAColorFormat &format, class VBoxVHWAGlProgramMngr * aMgr, VBOXVHWAIMG_TYPE flags) :
-            T(size, format, aMgr, flags & (~VBOXVHWAIMG_FBO)),
-            mFBOTex(size, VBoxVHWAColorFormat(32, 0xff0000, 0xff00, 0xff), aMgr, (flags & (~VBOXVHWAIMG_FBO)) | VBOXVHWAIMG_LINEAR),
+            T(size, format, aMgr, flags & (~(VBOXVHWAIMG_FBO | VBOXVHWAIMG_LINEAR))),
+            mFBOTex(size, VBoxVHWAColorFormat(32, 0xff0000, 0xff00, 0xff), aMgr, (flags & (~VBOXVHWAIMG_FBO))),
             mpvFBOTexMem(NULL)
     {

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlayCommon.h

@@ -20 +20 @@
 
 #if defined(DEBUG_misha)
+DECLINLINE(VOID) vboxDbgPrintF(LPCSTR szString, ...)
+{
+    char szBuffer[4096] = {0};
+    va_list pArgList;
+    va_start(pArgList, szString);
+    _vsnprintf(szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]), szString, pArgList);
+    va_end(pArgList);
+
+    OutputDebugStringA(szBuffer);
+}
+
 # include "iprt/stream.h"
 # define VBOXQGLLOG(_m) RTPrintf _m
 # define VBOXQGLLOGREL(_m) do { RTPrintf _m ; LogRel( _m ); } while(0)
+# define VBOXQGLDBGPRINT(_m) vboxDbgPrintF _m
 #else
 # define VBOXQGLLOG(_m)    do {}while(0)
 # define VBOXQGLLOGREL(_m) LogRel( _m )
+# define VBOXQGLDBGPRINT(_m) do {}while(0)
 #endif
 #define VBOXQGLLOG_ENTER(_m) do {}while(0)