Changeset 25453 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 17, 2009 11:27:18 AM (15 years ago)

Author:

vboxsync

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

56113

Message:

2d: more FBO support

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (7 diffs)
• VBoxFBOverlay.h (modified) (7 diffs)

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

@@ -309 +309 @@
 }
 
-static VBoxVHWATextureImage* vboxVHWAImageCreate(const QRect & aRect, const VBoxVHWAColorFormat & aFormat, class VBoxVHWAGlProgramMngr * pMgr, bool bDisablePBO)
-{
-#ifdef VBOXVHWA_NEW_PBO
+static VBoxVHWATextureImage* vboxVHWAImageCreate(const QRect & aRect, const VBoxVHWAColorFormat & aFormat, class VBoxVHWAGlProgramMngr * pMgr, VBOXVHWAIMG_TYPE flags)
+{
     const VBoxVHWAInfo & info = vboxVHWAGetSupportInfo(NULL);
-    if(!bDisablePBO && info.getGlInfo().isPBOSupported())
-    {
+    if((flags & VBOXVHWAIMG_PBO) && !info.getGlInfo().isPBOSupported())
+        flags &= ~VBOXVHWAIMG_PBO;
+
+    if((flags & VBOXVHWAIMG_PBOIMG) &&
+            (!info.getGlInfo().isPBOSupported() || !info.getGlInfo().isPBOOffsetSupported()))
+        flags &= ~VBOXVHWAIMG_PBOIMG;
+
+    if((flags & VBOXVHWAIMG_FBO) && !info.getGlInfo().isFBOSupported())
+        flags &= ~VBOXVHWAIMG_FBO;
+
+    /* ensure we don't create a PBO-based texture in case we use a PBO-based image */
+    if(flags & VBOXVHWAIMG_PBOIMG)
+        flags &= ~VBOXVHWAIMG_PBO;
+
+    if(flags & VBOXVHWAIMG_PBOIMG)
+    {
+        if(flags & VBOXVHWAIMG_FBO)
+        {
+            VBOXQGLLOG(("FBO PBO Image\n"));
+            return new VBoxVHWATextureImageFBO<VBoxVHWATextureImagePBO>(aRect, aFormat, pMgr, flags);
+        }
         VBOXQGLLOG(("PBO Image\n"));
-        return new VBoxVHWATextureImagePBO(aRect, aFormat, pMgr);
-    }
-#endif
+        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, bDisablePBO);
-}
-
-static VBoxVHWATexture* vboxVHWATextureCreate(const QGLContext * pContext, const QRect & aRect, const VBoxVHWAColorFormat & aFormat, bool bDisablePBO)
+    return new VBoxVHWATextureImage(aRect, aFormat, pMgr, flags);
+}
+
+static VBoxVHWATexture* vboxVHWATextureCreate(const QGLContext * pContext, const QRect & aRect, const VBoxVHWAColorFormat & aFormat, VBOXVHWAIMG_TYPE flags)
 {
     const VBoxVHWAInfo & info = vboxVHWAGetSupportInfo(pContext);
-    if(!bDisablePBO && info.getGlInfo().isPBOSupported())
+    if((flags & VBOXVHWAIMG_PBO) && info.getGlInfo().isPBOSupported())
     {
         VBOXQGLLOG(("VBoxVHWATextureNP2RectPBO\n"));
@@ -1195 +1217 @@
     resetDefaultSrcOverlayCKey();
 
-    mImage = vboxVHWAImageCreate(QRect(0,0,aSize.width(),aSize.height()), aColorFormat, getGlProgramMngr(), bVGA);
+    mImage = vboxVHWAImageCreate(QRect(0,0,aSize.width(),aSize.height()), aColorFormat, getGlProgramMngr(), bVGA ? 0 : (VBOXVHWAIMG_PBO | VBOXVHWAIMG_PBOIMG/* | VBOXVHWAIMG_FBO*/));
 
     setRectValues(aTargRect, aSrcRect);
@@ -1966 +1988 @@
 void VBoxGLWidget::adjustViewport(const QSize &display, const QRect &viewport)
 {
-#ifdef VBOXVHWA_OLD_COORD
-    /* viewport:  (viewport.x;viewport.y) (viewport.width;viewport.height)*/
-    glViewport(-((int)display.width() + viewport.x()),
-                -((int)display.height() - viewport.y() + display.height() - viewport.height()),
-                2*display.width(),
-                2*display.height());
-#else
     glViewport(-viewport.x(),
                    viewport.height() + viewport.y() - display.height(),
                display.width(),
                display.height());
-
-#endif
 }
 
 void VBoxGLWidget::setupMatricies(const QSize &display)
 {
-#ifdef VBOXVHWA_OLD_COORD
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    glFrustum(0., (GLdouble)display.width(), 0., (GLdouble)display.height(), 0., 0.);
-
-    glMatrixMode(GL_MODELVIEW);
-    //    doSetupMatrix(bInverted ? &mRect.size() : &mTargSize.size(), bInverted);
-    doSetupMatrix(display, false);
-#else
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
@@ -1998 +2002 @@
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
-#endif
 }
 
@@ -4991 +4994 @@
 }
 
-VBoxVHWATextureImage::VBoxVHWATextureImage(const QRect &size, const VBoxVHWAColorFormat &format, class VBoxVHWAGlProgramMngr * aMgr, bool bDisablePBO) :
+VBoxVHWATextureImage::VBoxVHWATextureImage(const QRect &size, const VBoxVHWAColorFormat &format, class VBoxVHWAGlProgramMngr * aMgr, VBOXVHWAIMG_TYPE flags) :
         mVisibleDisplay(0),
         mpProgram(0),
@@ -5000 +5003 @@
         mbNotIntersected(false)
 {
-    mpTex[0] = vboxVHWATextureCreate(NULL, size, format, bDisablePBO);
+    mpTex[0] = vboxVHWATextureCreate(NULL, size, format, flags);
     mColorFormat = format;
     if(mColorFormat.fourcc() == FOURCC_YV12)
     {
         QRect rect(size.x()/2,size.y()/2,size.width()/2,size.height()/2);
-        mpTex[1] = vboxVHWATextureCreate(NULL, rect, format, bDisablePBO);
-        mpTex[2] = vboxVHWATextureCreate(NULL, rect, format, bDisablePBO);
+        mpTex[1] = vboxVHWATextureCreate(NULL, rect, format, flags);
+        mpTex[2] = vboxVHWATextureCreate(NULL, rect, format, flags);
         mcTex = 3;
     }
@@ -5161 +5164 @@
 {
     uint32_t type = calcProgramType(pDst, pDstCKey, pSrcCKey, bNotIntersected);
-
-    if(pDstCKey != NULL)
-        type |= VBOXVHWA_PROGRAM_DSTCOLORKEY;
-    if(pSrcCKey)
-        type |= VBOXVHWA_PROGRAM_SRCCOLORKEY;
-    if((pDstCKey || pSrcCKey) && bNotIntersected)
-        type |= VBOXVHWA_PROGRAM_COLORKEYNODISCARD;
 
     return mProgramMngr->getProgram(type, &colorFormat(), pDst ? &pDst->colorFormat() : NULL);

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

@@ -29 +29 @@
 //#define VBOXVHWADBG_RENDERCHECK
 
-//#define VBOXVHWA_NEW_PBO
-
 #include "COMDefs.h"
 #include <QGLWidget>
@@ -377 +375 @@
 };
 
+#define VBOXVHWAIMG_PBO    0x00000001U
+#define VBOXVHWAIMG_PBOIMG 0x00000002U
+#define VBOXVHWAIMG_FBO    0x00000004U
+typedef uint32_t VBOXVHWAIMG_TYPE;
+
 class VBoxVHWATextureImage
 {
 public:
-    VBoxVHWATextureImage(const QRect &size, const VBoxVHWAColorFormat &format, class VBoxVHWAGlProgramMngr * aMgr, bool bDisablePBO);
+    VBoxVHWATextureImage(const QRect &size, const VBoxVHWAColorFormat &format, class VBoxVHWAGlProgramMngr * aMgr, VBOXVHWAIMG_TYPE flags);
 
     virtual ~VBoxVHWATextureImage()
@@ -549 +552 @@
 {
 public:
-    VBoxVHWATextureImagePBO(const QRect &size, const VBoxVHWAColorFormat &format, class VBoxVHWAGlProgramMngr * aMgr) :
-            VBoxVHWATextureImage(size, format, aMgr, true),
+    VBoxVHWATextureImagePBO(const QRect &size, const VBoxVHWAColorFormat &format, class VBoxVHWAGlProgramMngr * aMgr, VBOXVHWAIMG_TYPE flags) :
+            VBoxVHWATextureImage(size, format, aMgr, flags & (~VBOXVHWAIMG_PBO)),
             mPBO(0)
     {
@@ -1575 +1578 @@
 {
 public:
-    VBoxVHWATextureImageFBO(const QRect &size, const VBoxVHWAColorFormat &format, class VBoxVHWAGlProgramMngr * aMgr) :
-            T(size, format, aMgr),
-            mFBOTex(size, VBoxVHWAColorFormat(32, 0xff0000, 0xff00, 0xff), aMgr)
-    {
+    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)),
+            mpvFBOTexMem(NULL)
+    {
+    }
+
+    virtual ~VBoxVHWATextureImageFBO()
+    {
+        if(mpvFBOTexMem)
+            free(mpvFBOTexMem);
     }
 
@@ -1584 +1594 @@
     {
         mFBO.init();
-        mFBOTex.init(NULL);
-        T:init(pvMem);
+        mpvFBOTexMem = (uchar*)malloc(mFBOTex.memSize());
+        mFBOTex.init(mpvFBOTexMem);
+        T::init(pvMem);
         mFBO.bind();
-        mFBO.attachBound(mFBOTex.mpTex[0]);
+        mFBO.attachBound(mFBOTex.component(0));
         mFBO.unbind();
     }
@@ -1595 +1606 @@
             GLuint *pDisplay, class VBoxVHWAGlProgramVHWA ** ppProgram)
     {
-        T::createDisplay(&mFBOTex, &mFBOTex.rect(), &rect(),
+        T::createDisplay(NULL, &mFBOTex.rect(), &rect(),
                 NULL, NULL, false,
                 pDisplay, ppProgram);
 
-        return mFBOTex.createDisplay(pDst, pDstRect, pSrcRect,
-                pDstCKey, pSrcCKey, bNotIntersected,
-                pDisplay, ppProgram);
+        return mFBOTex.initDisplay(pDst, pDstRect, pSrcRect,
+                pDstCKey, pSrcCKey, bNotIntersected);
     }
 
     virtual void update(const QRect * pRect)
     {
+        T::update(pRect);
+
+        VBoxGLWidget::pushSettingsAndSetupViewport(rect().size(), rect());
         mFBO.bind();
-        T:update(pRect);
-
-        VBoxGLWidget::pushSettingsAndSetupViewport(rect(), rect());
-        mFBO.bind();
-        mFBOTex.display();
+        T::display();
         mFBO.unbind();
         VBoxGLWidget::popSettingsAfterSetupViewport();
@@ -1631 +1640 @@
     VBoxVHWAFBO mFBO;
     VBoxVHWATextureImage mFBOTex;
+    uchar * mpvFBOTexMem;
 };