Changeset 21977 in vbox

Timestamp:

Aug 5, 2009 10:09:21 AM (15 years ago)

Author:

vboxsync

Message:

video hw accel: non-rect textures & PBO support

File:

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

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

@@ -23 +23 @@
 #ifndef ___VBoxFrameBuffer_h___
 #define ___VBoxFrameBuffer_h___
-
+//#define VBOXQGL_PROF_BASE 1
 #include "COMDefs.h"
 #include <iprt/critsect.h>
@@ -666 +666 @@
     VBoxVHWATexture() {}
     VBoxVHWATexture(const QRect * pRect, const VBoxVHWAColorFormat *pFormat);
-//    virtual ~VBoxVHWATexture();
+    virtual ~VBoxVHWATexture();
     virtual void init(uchar *pvMem);
     void setAddress(uchar *pvMem) {mAddress = pvMem;}
-    virtual void update(const QRect * pRect);
+    void update(const QRect * pRect) { doUpdate(mAddress, pRect);}
     void bind() {glBindTexture(texTarget(), mTexture);}
 
@@ -679 +679 @@
     const QRect & rect() {return mRect;}
     uchar * address(){ return mAddress; }
+    uint32_t rectSizeTex(const QRect * pRect) {return pRect->width() * pRect->height() * mBytesPerPixel;}
     uchar * pointAddress(int x, int y)
     {
@@ -685 +686 @@
         return pointAddressTex(x, y);
     }
-    uchar * pointAddressTex(int x, int y) { return mAddress + y*mBytesPerLine + x*mBytesPerPixel; }
+    uint32_t pointOffsetTex(int x, int y) { return y*mBytesPerLine + x*mBytesPerPixel; }
+    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(); }
 
-    void uninit();
-
 protected:
+    virtual void doUpdate(uchar * pAddress, const QRect * pRect);
     virtual void initParams();
     virtual void load();
@@ -705 +706 @@
     uint32_t mBytesPerLine;
     VBoxVHWAColorFormat mColorFormat;
+private:
+    void uninit();
 };
 
@@ -715 +718 @@
         mTexRect = *pRect;
     }
-protected:
 };
 
@@ -729 +731 @@
 protected:
     virtual GLenum texTarget();
+};
+
+class VBoxVHWATextureNP2RectPBO : public VBoxVHWATextureNP2Rect
+{
+public:
+        VBoxVHWATextureNP2RectPBO() : VBoxVHWATextureNP2Rect() {}
+        VBoxVHWATextureNP2RectPBO(const QRect * pRect, const VBoxVHWAColorFormat *pFormat) :
+                VBoxVHWATextureNP2Rect(pRect, pFormat){}
+    virtual ~VBoxVHWATextureNP2RectPBO();
+
+    virtual void init(uchar *pvMem);
+protected:
+    virtual void load();
+    virtual void doUpdate(uchar * pAddress, const QRect * pRect);
+private:
+    void updateBuffer(uchar * pBuf, const QRect * pRect);
+    GLuint mPBO;
 };
 
@@ -993 +1012 @@
 
     uchar * mAddress;
-    VBoxVHWATexture mTex[3];
+    VBoxVHWATexture *mpTex[3];
 
     VBoxVHWAColorFormat mColorFormat;