Changeset 21414 in vbox for trunk

Timestamp:

Jul 8, 2009 9:59:19 PM (16 years ago)

Author:

vboxsync

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

49793

Message:

video hw accel: basis for overlay impl in QGLFramebuffer, bugfixes

File:

• trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h (modified) (10 diffs)

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

@@ -494 +494 @@
 {
 public:
-    VBoxVHWASurfaceBase(class VBoxVHWAGlContextState *aState, bool aIsYInverted, GLsizei aWidth, GLsizei aHeight,
+    VBoxVHWASurfaceBase(class VBoxVHWAGlContextState *aState, bool aIsYInverted, const QSize * aSize, const QSize * aTargetSize,
             VBoxVHWAColorFormat & aColorFormat,
             VBoxVHWAColorKey * pSrcBltCKey, VBoxVHWAColorKey * pDstBltCKey,
@@ -516 +516 @@
 
     void performDisplay();
+
+    void setRects(const QRect * aTargRect, const QRect * aSrcRect);
+    void setTargetRectPosition(const QPoint * aPoint);
 
     static ulong calcBytesPerPixel(GLenum format, GLenum type);
@@ -564 +567 @@
     bool isFrontBuffer() {return !mIsYInverted; }
 
-    bool isOverlay() { return mIsOverlay; }
+//    bool isOverlay() { return mIsOverlay; }
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -573 +576 @@
     void initDisplay();
     void deleteDisplay();
+    void initDisplay(bool bInverted);
+    void deleteDisplay(bool bInverted);
+    GLuint createDisplay(bool bInverted);
     void synchTex(const QRect * aRect);
     void synchTexMem(const QRect * aRect);
@@ -580 +586 @@
     void synch(const QRect * aRect);
 
-    void doTex2FB(const QRect * aRect);
-
-    void doSetupModelView(bool bInverted);
-
-    QRect mRect;
-
-    GLuint mDisplay;
-    bool mDisplayInitialized;
+//    void doTex2FB(const QRect * aRect);
+    void doTex2FB(const QRect * pDstRect, const QRect * pSrcRect);
+
+    void doSetupMatrix(const QSize * pSize, bool bInverted);
+
+    QRect mRect; /* == Inv FB size */
+    QRect mTexRect; /* texture size */
+
+    QRect mSrcRect;
+    QRect mTargRect; /* == Vis FB size */
+    QRect mTargSize;
+
+    GLuint mYInvertedDisplay;
+    GLuint mVisibleDisplay;
+
+    bool mYInvertedDisplayInitialized;
+    bool mVisibleDisplayInitialized;
 
     uchar * mAddress;
@@ -626 +641 @@
     bool mIsYInverted;
 
-    bool mIsOverlay;
+//    bool mIsOverlay;
 
 protected:
@@ -676 +691 @@
         pCurr->invert();
         pTarg->invert();
-        if(pTarg->isOverlay())
+        if(pCurr == mSurfPrimary) /* flip of the primary surface */
+        {
+            mSurfPrimary = pTarg;
+        }
+        else /* flip of the overlay */
         {
             for (OverlayList::iterator it = mOverlays.begin();
@@ -687 +706 @@
             }
         }
-        else
-        {
-            mSurfPrimary = pTarg;
-        }
     }
 
@@ -781 +796 @@
 {
 public:
-    VBoxVHWASurfaceQGL(class VBoxVHWAGlContextState *aState, GLsizei aWidth, GLsizei aHeight,
+    VBoxVHWASurfaceQGL(class VBoxVHWAGlContextState *aState, const QSize * aSize, const QSize * aTargetSize,
             VBoxVHWAColorFormat & aColorFormat,
             VBoxVHWAColorKey * pSrcBltCKey, VBoxVHWAColorKey * pDstBltCKey,
@@ -787 +802 @@
             class VBoxGLWidget *pWidget,
             bool bInvisibleBuffer) :
-                VBoxVHWASurfaceBase(aState, bInvisibleBuffer, aWidth, aHeight,
+                VBoxVHWASurfaceBase(aState, bInvisibleBuffer, aSize, aTargetSize,
                         aColorFormat,
                         pSrcBltCKey, pDstBltCKey, pSrcOverlayCKey, pDstOverlayCKey),