Changeset 21490 in vbox for trunk/src/VBox/Frontends/VirtualBox/include

Timestamp:

Jul 10, 2009 5:29:38 PM (16 years ago)

Author:

vboxsync

Message:

video hw accel: overlay support (not debugged yet), better colorkey & flip support impl in guest driver & QGLFramebuffer (not debugged yet)

File:

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

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

@@ -408 +408 @@
     uint32_t upper() const {return mUpper; }
     uint32_t lower() const {return mLower; }
+
+    bool operator==(const VBoxVHWAColorKey & other) const { return mUpper == other.mUpper && mLower == other.mLower; }
 private:
     uint32_t mUpper;
     uint32_t mLower;
 };
+
+//class VBoxVHWAColorKeyRef
+//{
+//public:
+//    VBoxVHWAColorKeyRef() : mValid(false){}
+//
+//    bool isValid() {return mValid; }
+//
+//    VBoxVHWAColorKey * ckey() { isVreturn mpCKey; }
+//    const VBoxVHWAColorKey * constckey() const { return mpCKey; }
+//
+//    void invalidate() { mValid = false; }
+//    void set(VBoxVHWAColorKey * pKey) { mValid = false; }
+//
+//private:
+//    VBoxVHWAColorKey * mpCKey;
+//    bool mValid;
+//};
 
 class VBoxVHWAColorComponent
@@ -508 +528 @@
 
     int blt(const QRect * aDstRect, VBoxVHWASurfaceBase * aSrtSurface, const QRect * aSrcRect, const VBoxVHWAColorKey * pDstCKeyOverride, const VBoxVHWAColorKey * pSrcCKeyOverride);
+    int overlay(VBoxVHWASurfaceBase * aOverlaySurface);
 
     virtual int lock(const QRect * pRect, uint32_t flags);
@@ -541 +562 @@
     ulong  bytesPerLine() { return mBytesPerLine; }
 
-    const VBoxVHWAColorKey * dstBltCKey() { return mDstBltCKeyValid ? &mDstBltCKey : NULL; }
-    const VBoxVHWAColorKey * srcBltCKey() { return mSrcBltCKeyValid ? &mSrcBltCKey : NULL; }
-    const VBoxVHWAColorKey * dstOverlayCKey() { return mDstOverlayCKeyValid ? &mDstOverlayCKey : NULL; }
-    const VBoxVHWAColorKey * srcOverlayCKey() { return mSrcOverlayCKeyValid ? &mSrcOverlayCKey : NULL; }
+    const VBoxVHWAColorKey * dstBltCKey() const { return mpDstBltCKey; }
+    const VBoxVHWAColorKey * srcBltCKey() const { return mpSrcBltCKey; }
+    const VBoxVHWAColorKey * dstOverlayCKey() const { return mpDstOverlayCKey; }
+    const VBoxVHWAColorKey * defaultSrcOverlayCKey() const { return mpDefaultSrcOverlayCKey; }
+    const VBoxVHWAColorKey * defaultDstOverlayCKey() const { return mpDefaultDstOverlayCKey; }
+    const VBoxVHWAColorKey * srcOverlayCKey() const { return mpSrcOverlayCKey; }
+    void resetDefaultSrcOverlayCKey() { mpSrcOverlayCKey = mpDefaultSrcOverlayCKey; }
+    void resetDefaultDstOverlayCKey() { mpDstOverlayCKey = mpDefaultDstOverlayCKey; }
+
+    void setDstBltCKey(const VBoxVHWAColorKey * ckey)
+    {
+        if(ckey)
+        {
+            mDstBltCKey = *ckey;
+            mpDstBltCKey = &mDstBltCKey;
+        }
+        else
+        {
+            mpDstBltCKey = NULL;
+        }
+    }
+
+    void setSrcBltCKey(const VBoxVHWAColorKey * ckey)
+    {
+        if(ckey)
+        {
+            mSrcBltCKey = *ckey;
+            mpSrcBltCKey = &mSrcBltCKey;
+        }
+        else
+        {
+            mpSrcBltCKey = NULL;
+        }
+    }
+
+    void setDefaultDstOverlayCKey(const VBoxVHWAColorKey * ckey)
+    {
+        if(ckey)
+        {
+            mDefaultDstOverlayCKey = *ckey;
+            mpDefaultDstOverlayCKey = &mDefaultDstOverlayCKey;
+        }
+        else
+        {
+            mpDefaultDstOverlayCKey = NULL;
+        }
+    }
+
+    void setDefaultSrcOverlayCKey(const VBoxVHWAColorKey * ckey)
+    {
+        if(ckey)
+        {
+            mDefaultSrcOverlayCKey = *ckey;
+            mpDefaultSrcOverlayCKey = &mDefaultSrcOverlayCKey;
+        }
+        else
+        {
+            mpDefaultSrcOverlayCKey = NULL;
+        }
+    }
+
+    void setOverriddenDstOverlayCKey(const VBoxVHWAColorKey * ckey)
+    {
+        if(ckey)
+        {
+            mOverriddenDstOverlayCKey = *ckey;
+            mpDstOverlayCKey = &mOverriddenDstOverlayCKey;
+        }
+        else
+        {
+            mpDstOverlayCKey = NULL;
+        }
+    }
+
+    void setOverriddenSrcOverlayCKey(const VBoxVHWAColorKey * ckey)
+    {
+        if(ckey)
+        {
+            mOverriddenSrcOverlayCKey = *ckey;
+            mpSrcOverlayCKey = &mOverriddenSrcOverlayCKey;
+        }
+        else
+        {
+            mpSrcOverlayCKey = NULL;
+        }
+    }
+
+
     const VBoxVHWAColorFormat & colorFormat() {return mColorFormat; }
 
@@ -562 +667 @@
 
     bool isYInverted() {return mIsYInverted; }
+
+    bool isHidden() {return mIsHidden; }
+    void setHidden(bool hidden) { mIsHidden = hidden; }
 
     int invert();
@@ -586 +694 @@
     void synch(const QRect * aRect);
 
+    int performBlt(const QRect * pDstRect, VBoxVHWASurfaceBase * pSrcSurface, const QRect * pSrcRect, const VBoxVHWAColorKey * pDstCKey, const VBoxVHWAColorKey * pSrcCKey, bool blt);
+
 //    void doTex2FB(const QRect * aRect);
     void doTex2FB(const QRect * pDstRect, const QRect * pSrcRect);
@@ -608 +718 @@
 
     VBoxVHWAColorFormat mColorFormat;
+
+    VBoxVHWAColorKey *mpSrcBltCKey;
+    VBoxVHWAColorKey *mpDstBltCKey;
+    VBoxVHWAColorKey *mpSrcOverlayCKey;
+    VBoxVHWAColorKey *mpDstOverlayCKey;
+
+    VBoxVHWAColorKey *mpDefaultDstOverlayCKey;
+    VBoxVHWAColorKey *mpDefaultSrcOverlayCKey;
+
     VBoxVHWAColorKey mSrcBltCKey;
     VBoxVHWAColorKey mDstBltCKey;
-    VBoxVHWAColorKey mSrcOverlayCKey;
-    VBoxVHWAColorKey mDstOverlayCKey;
-    bool mSrcBltCKeyValid;
-    bool mDstBltCKeyValid;
-    bool mSrcOverlayCKeyValid;
-    bool mDstOverlayCKeyValid;
+    VBoxVHWAColorKey mOverriddenSrcOverlayCKey;
+    VBoxVHWAColorKey mOverriddenDstOverlayCKey;
+    VBoxVHWAColorKey mDefaultDstOverlayCKey;
+    VBoxVHWAColorKey mDefaultSrcOverlayCKey;
+
+
     GLenum mFormat;
     GLint  mInternalFormat;
@@ -641 +760 @@
     bool mIsYInverted;
 
+    bool mIsHidden;
+
 //    bool mIsOverlay;
 
@@ -670 +791 @@
     {
         return mSurfVGA;
+    }
+
+    VBoxVHWASurfaceBase * getPrimary()
+    {
+        return mSurfPrimary;
     }
 
@@ -715 +841 @@
              it != mOverlays.end(); ++ it)
         {
-            (*it)->performDisplay();
+            mSurfPrimary->overlay(*it);
         }
     }
@@ -781 +907 @@
                 mInverted = false;
             }
+        }
+    }
+
+    void makeCurrent(class VBoxVHWASurfaceBase *aContext, bool mInverted)
+    {
+        if(mInverted)
+        {
+            makeYInvertedCurrent(aContext);
+        }
+        else
+        {
+            makeCurrent(aContext);
         }
     }
@@ -909 +1047 @@
     int vhwaSurfaceBlt(struct _VBOXVHWACMD_SURF_BLT *pCmd);
     int vhwaSurfaceFlip(struct _VBOXVHWACMD_SURF_FLIP *pCmd);
+    int vhwaSurfaceOverlayUpdate(struct _VBOXVHWACMD_SURF_OVERLAY_UPDATE *pCmf);
+    int vhwaSurfaceOverlaySetPosition(struct _VBOXVHWACMD_SURF_OVERLAY_SETPOSITION *pCmd);
+    int vhwaSurfaceColorkeySet(struct _VBOXVHWACMD_SURF_COLORKEY_SET *pCmd);
     int vhwaQueryInfo1(struct _VBOXVHWACMD_QUERYINFO1 *pCmd);
     int vhwaQueryInfo2(struct _VBOXVHWACMD_QUERYINFO2 *pCmd);