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

Timestamp:

Dec 16, 2009 4:55:45 PM (15 years ago)

Author:

vboxsync

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

56090

Message:

2d: more FBO impl

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (1 diff)
• VBoxFBOverlay.h (modified) (6 diffs)

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

@@ -5158 +5158 @@
 }
 
+uint32_t VBoxVHWATextureImage::calcProgramType(VBoxVHWATextureImage *pDst, const VBoxVHWAColorKey * pDstCKey, const VBoxVHWAColorKey * pSrcCKey, bool bNotIntersected)
+{
+    uint32_t type = 0;
+
+    if(pDstCKey != NULL)
+        type |= VBOXVHWA_PROGRAM_DSTCOLORKEY;
+    if(pSrcCKey)
+        type |= VBOXVHWA_PROGRAM_SRCCOLORKEY;
+    if((pDstCKey || pSrcCKey) && bNotIntersected)
+        type |= VBOXVHWA_PROGRAM_COLORKEYNODISCARD;
+
+    return type;
+}
+
 class VBoxVHWAGlProgramVHWA * VBoxVHWATextureImage::calcProgram(VBoxVHWATextureImage *pDst, const VBoxVHWAColorKey * pDstCKey, const VBoxVHWAColorKey * pSrcCKey, bool bNotIntersected)
 {
-    uint32_t type = 0;
+    uint32_t type = calcProgramType(pDst, pDstCKey, pSrcCKey, bNotIntersected);
 
     if(pDstCKey != NULL)

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

@@ -482 +482 @@
     }
 
-    void draw(VBoxVHWATextureImage *pDst, const QRect * pDstRect, const QRect * pSrcRect);
-
-    uint32_t texCoord(GLenum tex, int x, int y)
+    virtual void draw(VBoxVHWATextureImage *pDst, const QRect * pDstRect, const QRect * pSrcRect);
+
+    virtual uint32_t texCoord(GLenum tex, int x, int y)
     {
         uint32_t c = 1;
@@ -498 +498 @@
     }
 
-    void bind(VBoxVHWATextureImage * pPrimary);
-
-    class VBoxVHWAGlProgramVHWA * calcProgram(VBoxVHWATextureImage *pDst, const VBoxVHWAColorKey * pDstCKey, const VBoxVHWAColorKey * pSrcCKey, bool bNotIntersected);
-
-    int createDisplay(VBoxVHWATextureImage *pDst, const QRect * pDstRect, const QRect * pSrcRect,
+    virtual void bind(VBoxVHWATextureImage * pPrimary);
+
+    virtual uint32_t calcProgramType(VBoxVHWATextureImage *pDst, const VBoxVHWAColorKey * pDstCKey, const VBoxVHWAColorKey * pSrcCKey, bool bNotIntersected);
+
+    virtual class VBoxVHWAGlProgramVHWA * calcProgram(VBoxVHWATextureImage *pDst, const VBoxVHWAColorKey * pDstCKey, const VBoxVHWAColorKey * pSrcCKey, bool bNotIntersected);
+
+    virtual int createDisplay(VBoxVHWATextureImage *pDst, const QRect * pDstRect, const QRect * pSrcRect,
             const VBoxVHWAColorKey * pDstCKey, const VBoxVHWAColorKey * pSrcCKey, bool bNotIntersected,
             GLuint *pDisplay, class VBoxVHWAGlProgramVHWA ** ppProgram);
@@ -678 +680 @@
     }
 
-    void bind(VBoxVHWATexture *pTex)
+    void bind()
     {
         VBOXQGL_CHECKERR(
             vboxglBindFramebuffer(GL_FRAMEBUFFER, mFBO);
         );
+    }
+
+    void unbind(VBoxVHWATexture *pTex)
+    {
+        VBOXQGL_CHECKERR(
+            vboxglBindFramebuffer(GL_FRAMEBUFFER, 0);
+        );
+    }
+
+    void attachBound(VBoxVHWATexture *pTex)
+    {
         VBOXQGL_CHECKERR(
                 vboxglFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, pTex->texTarget(), pTex->texture(), 0);
         );
     }
+
 private:
     GLuint mFBO;
+};
+
+template <class T>
+class VBoxVHWATextureImageFBO : public T
+{
+public:
+    VBoxVHWATextureImageFBO(const QRect &size, const VBoxVHWAColorFormat &format, class VBoxVHWAGlProgramMngr * aMgr) :
+            T(size, format, aMgr),
+            mFBOTex(size, VBoxVHWAColorFormat(32, 0xff0000, 0xff00, 0xff), aMgr)
+    {
+    }
+
+    virtual void init(uchar *pvMem)
+    {
+        mFBO.init();
+        mFBOTex.init(NULL);
+        T:init(pvMem);
+        mFBO.bind();
+        mFBO.attachBound(mFBOTex.mpTex[0]);
+        mFBO.unbind();
+    }
+
+    virtual int createDisplay(VBoxVHWATextureImage *pDst, const QRect * pDstRect, const QRect * pSrcRect,
+            const VBoxVHWAColorKey * pDstCKey, const VBoxVHWAColorKey * pSrcCKey, bool bNotIntersected,
+            GLuint *pDisplay, class VBoxVHWAGlProgramVHWA ** ppProgram)
+    {
+        T::createDisplay(&mFBOTex, &mFBOTex.rect(), &rect(),
+                NULL, NULL, false,
+                pDisplay, ppProgram);
+
+        return mFBOTex.createDisplay(pDst, pDstRect, pSrcRect,
+                pDstCKey, pSrcCKey, bNotIntersected,
+                pDisplay, ppProgram);
+    }
+
+    virtual void update(const QRect * pRect)
+    {
+        mFBO.bind();
+        T:update(pRect);
+
+        VBoxGLWidget::pushSettingsAndSetupViewport(rect(), rect());
+        mFBO.bind();
+        mFBOTex.draw();
+        mFBO.unbind();
+        VBoxGLWidget::popSettingsAfterSetupViewport();
+    }
+
+    virtual void display(VBoxVHWATextureImage *pDst, const QRect * pDstRect, const QRect * pSrcRect,
+            const VBoxVHWAColorKey * pDstCKey, const VBoxVHWAColorKey * pSrcCKey, bool bNotIntersected)
+    {
+        mFBOTex.display(pDst, pDstRect, pSrcRect, pDstCKey, pSrcCKey, bNotIntersected);
+    }
+
+    virtual void display()
+    {
+        mFBOTex.display();
+    }
+private:
+    VBoxVHWAFBO mFBO;
+    VBoxVHWATextureImage mFBOTex;
 };
 
@@ -1430 +1504 @@
 
     VHWACommandList &onResizeCmdList() { return mOnResizeCmdList; }
+
+    static void pushSettingsAndSetupViewport(const QSize &display, const QRect &viewport)
+    {
+        glPushAttrib(GL_ALL_ATTRIB_BITS);
+        glMatrixMode(GL_PROJECTION);
+        glPushMatrix();
+//        glMatrixMode(GL_MODELVIEW);
+        setupMatricies(display);
+        adjustViewport(display, viewport);
+    }
+
+    static void popSettingsAfterSetupViewport()
+    {
+        glPopAttrib();
+        glMatrixMode(GL_PROJECTION);
+        glPopMatrix();
+        glMatrixMode(GL_MODELVIEW);
+    }
+
 protected:
 
@@ -1710 +1803 @@
                              ULONG aW, ULONG aH)
     {
-        if(mOverlay.onNotifyUpdate(aX, aY, aW, aH))
+        if(mOverlay.onNotifyUpdate (aX, aY, aW, aH))
             return S_OK;
-        return T::NotifyUpdate(aX, aY, aW, aH);
+        return T::NotifyUpdate (aX, aY, aW, aH);
     }
 
     void resizeEvent (VBoxResizeEvent *re)
     {
-        mOverlay.onResizeEvent(re);
-        T::resizeEvent(re);
-        mOverlay.onResizeEventPostprocess(re);
-    }
-
-    void viewportResized(QResizeEvent * re)
+        mOverlay.onResizeEvent (re);
+        T::resizeEvent (re);
+        mOverlay.onResizeEventPostprocess (re);
+    }
+
+    void viewportResized (QResizeEvent * re)
     {
         mOverlay.onViewportResized(re);
@@ -1728 +1821 @@
     }
 
-    void viewportScrolled(int dx, int dy)
-    {
-        mOverlay.onViewportScrolled(dx, dy);
-        T::viewportScrolled(dx, dy);
+    void viewportScrolled (int dx, int dy)
+    {
+        mOverlay.onViewportScrolled (dx, dy);
+        T::viewportScrolled (dx, dy);
     }
 private: