Changeset 22028 in vbox

Timestamp:

Aug 6, 2009 11:50:01 AM (16 years ago)

Author:

vboxsync

Message:

video hw accel: perf improvements: 1.YV12 stored as BGRA, 2.PBO used for overlays; bug-fixes

Location:

trunk

Files:

• include/VBox/VBoxVideo.h (modified) (1 diff)
• src/VBox/Additions/WINNT/Graphics/Display/dd.c (modified) (2 diffs)
• src/VBox/Additions/WINNT/Graphics/Display/driver.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h (modified) (12 diffs)

trunk/include/VBox/VBoxVideo.h

@@ -366 +366 @@
     uint32_t width;
     uint32_t pitch;
-    uint32_t bitsPerPixel;
+    uint32_t sizeX;
+    uint32_t sizeY;
     uint32_t cBackBuffers;
+    uint32_t Reserved;
     VBOXVHWA_COLORKEY DstOverlayCK;
     VBOXVHWA_COLORKEY DstBltCK;

trunk/src/VBox/Additions/WINNT/Graphics/Display/dd.c

@@ -670 +670 @@
                 if(pCmd->rc == VINF_SUCCESS)
                 {
+                        uint32_t surfSizeX = pBody->SurfInfo.sizeX;
+                        uint32_t surfSizeY = pBody->SurfInfo.sizeY;
                     pDesc->hHostHandle = pBody->u.out.hSurf;
                     lpSurfaceGlobal->dwReserved1 = (ULONG_PTR)pDesc;
                     lPitch = pBody->SurfInfo.pitch;
-                    lBpp = pBody->SurfInfo.bitsPerPixel;
-                    pDesc->cBitsPerPixel = lBpp;
+//                    lBpp = pBody->SurfInfo.bitsPerPixel;
+//                    pDesc->cBitsPerPixel = lBpp;
 #if 0
                     lpSurfaceGlobal->dwBlockSizeX   = lPitch;
@@ -680 +682 @@
                     lpSurfaceGlobal->lPitch         = lPitch;
 #else
-                    lpSurfaceGlobal->dwBlockSizeX   = lPitch * lpSurfaceGlobal->wHeight;
-                    lpSurfaceGlobal->dwBlockSizeY   = 1;
+                    lpSurfaceGlobal->dwBlockSizeX   = surfSizeX;
+                    lpSurfaceGlobal->dwBlockSizeY   = surfSizeY;
                     lpSurfaceGlobal->lPitch         = lPitch;
 #endif

trunk/src/VBox/Additions/WINNT/Graphics/Display/driver.h

@@ -108 +108 @@
     volatile uint32_t cPendingFlipsCurr;
     volatile uint32_t cPendingFlipsTarg;
-    uint32_t cBitsPerPixel;
+//    uint32_t cBitsPerPixel;
     bool bHidden;
     VBOXVHWAREGION UpdatedMemRegion;

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

@@ -634 +634 @@
     uint32_t fourcc() const {return mDataFormat;}
     uint32_t bitsPerPixel() const { return mBitsPerPixel; }
-    uint32_t bitsPerPixelDd() const { return mBitsPerPixelDd; }
+    uint32_t bitsPerPixelTex() const { return mBitsPerPixelTex; }
+//    uint32_t bitsPerPixelDd() const { return mBitsPerPixelDd; }
     void pixel2Normalized(uint32_t pix, float *r, float *g, float *b) const;
     uint32_t widthCompression() const {return mWidthCompression;}
@@ -652 +653 @@
 
     uint32_t mBitsPerPixel;
-    uint32_t mBitsPerPixelDd;
+    uint32_t mBitsPerPixelTex;
+//    uint32_t mBitsPerPixelDd;
     uint32_t mWidthCompression;
     uint32_t mHeightCompression;
@@ -679 +681 @@
     const QRect & rect() {return mRect;}
     uchar * address(){ return mAddress; }
-    uint32_t rectSizeTex(const QRect * pRect) {return pRect->width() * pRect->height() * mBytesPerPixel;}
+    uint32_t rectSizeTex(const QRect * pRect) {return pRect->width() * pRect->height() * mBytesPerPixelTex;}
     uchar * pointAddress(int x, int y)
     {
@@ -686 +688 @@
         return pointAddressTex(x, y);
     }
-    uint32_t pointOffsetTex(int x, int y) { return y*mBytesPerLine + x*mBytesPerPixel; }
+    uint32_t pointOffsetTex(int x, int y) { return y*mBytesPerLine + x*mBytesPerPixelTex; }
     uchar * pointAddressTex(int x, int y) { return mAddress + pointOffsetTex(x, y); }
     int toXTex(int x) {return x/mColorFormat.widthCompression();}
     int toYTex(int y) {return y/mColorFormat.heightCompression();}
-    ulong memSize(){ return mBytesPerLine * mRect.height()/mColorFormat.heightCompression(); }
+    ulong memSize(){ return mBytesPerLine * mRect.height(); }
+    uint32_t bytesPerLine() {return mBytesPerLine; }
 
 protected:
@@ -704 +707 @@
     GLuint mTexture;
     uint32_t mBytesPerPixel;
+    uint32_t mBytesPerPixelTex;
     uint32_t mBytesPerLine;
     VBoxVHWAColorFormat mColorFormat;
@@ -716 +720 @@
     VBoxVHWATextureNP2(const QRect * pRect, const VBoxVHWAColorFormat *pFormat) :
         VBoxVHWATexture(pRect, pFormat){
-        mTexRect = *pRect;
+        mTexRect = QRect(0, 0, pRect->width()/pFormat->widthCompression(), pRect->height()/pFormat->heightCompression());
     }
 };
@@ -782 +786 @@
             VBoxVHWAColorFormat & aColorFormat,
             VBoxVHWAColorKey * pSrcBltCKey, VBoxVHWAColorKey * pDstBltCKey,
-            VBoxVHWAColorKey * pSrcOverlayCKey, VBoxVHWAColorKey * pDstOverlayCKey);
+            VBoxVHWAColorKey * pSrcOverlayCKey, VBoxVHWAColorKey * pDstOverlayCKey,
+            bool bVGA);
 
     virtual ~VBoxVHWASurfaceBase();
@@ -824 +829 @@
     uint32_t fourcc() {return mColorFormat.fourcc(); }
 
-    ulong  bytesPerPixel() { return mBytesPerPixel; }
+//    ulong  bytesPerPixel() { return mpTex[0]->bytesPerPixel(); }
     ulong  bitsPerPixel() { return mColorFormat.bitsPerPixel(); }
-    ulong  bitsPerPixelDd() { return mColorFormat.bitsPerPixelDd(); }
-    ulong  bytesPerLine() { return mBytesPerLine; }
+//    ulong  bitsPerPixelDd() { return mColorFormat.bitsPerPixelDd(); }
+    ulong  bytesPerLine() { return mpTex[0]->bytesPerLine(); }
 
     const VBoxVHWAColorKey * dstBltCKey() const { return mpDstBltCKey; }
@@ -934 +939 @@
 
     const QRect& rect() {return mRect;}
-    const QRect& texRect() {return mTexRect;}
+//    const QRect& texRect() {return mTexRect;}
 
 //    /* surface currently being displayed in a flip chain */
@@ -990 +995 @@
 //    void doTex2FB(const QRect * aRect);
     void doTex2FB(const QRect * pDstRect, const QRect * pSrcRect);
-    void doMultiTex2FB(const QRect * pDstRect, const QRect * pDstTexSize, const QRect * pSrcRect, int cSrcTex);
+    void doMultiTex2FB(const QRect * pDstRect, VBoxVHWATexture * pDstTex, const QRect * pSrcRect, int cSrcTex);
     void doMultiTex2FB(const QRect * pDstRect, const QRect * pSrcRect, int cSrcTex);
 //    void doMultiTex2FB(GLenum tex, const QRect * pDstRect, const QRect * pSrcRect);
@@ -997 +1002 @@
 
     QRect mRect; /* == Inv FB size */
-    QRect mTexRect; /* texture size */
+//    QRect mTexRect; /* texture size */
 
     QRect mSrcRect;
@@ -1032 +1037 @@
 
 
-    GLenum mFormat;
-    GLint  mInternalFormat;
-    GLenum mType;
+//    GLenum mFormat;
+//    GLint  mInternalFormat;
+//    GLenum mType;
 //    ulong  mDisplayWidth;
 //    ulong  mDisplayHeight;
-    ulong  mBytesPerPixel;
-    ulong  mBytesPerLine;
+//    ulong  mBytesPerPixel;
+//    ulong  mBytesPerLine;
 
     int mLockCount;