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

Timestamp:

Dec 17, 2009 8:17:25 PM (15 years ago)

Author:

vboxsync

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

56136

Message:

2d: enabled FBO: linear stretching

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (4 diffs)
• VBoxFBOverlay.h (modified) (8 diffs)

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

@@ -348 +348 @@
 {
     const VBoxVHWAInfo & info = vboxVHWAGetSupportInfo(pContext);
+    GLint scaleFunc = (flags & VBOXVHWAIMG_LINEAR) ? GL_LINEAR : GL_NEAREST;
     if((flags & VBOXVHWAIMG_PBO) && info.getGlInfo().isPBOSupported())
     {
         VBOXQGLLOG(("VBoxVHWATextureNP2RectPBO\n"));
-        return new VBoxVHWATextureNP2RectPBO(aRect, aFormat);
+        return new VBoxVHWATextureNP2RectPBO(aRect, aFormat, scaleFunc);
     }
     else if(info.getGlInfo().isTextureRectangleSupported())
     {
         VBOXQGLLOG(("VBoxVHWATextureNP2Rect\n"));
-        return new VBoxVHWATextureNP2Rect(aRect, aFormat);
+        return new VBoxVHWATextureNP2Rect(aRect, aFormat, scaleFunc);
     }
     else if(info.getGlInfo().isTextureNP2Supported())
     {
         VBOXQGLLOG(("VBoxVHWATextureNP2\n"));
-        return new VBoxVHWATextureNP2(aRect, aFormat);
+        return new VBoxVHWATextureNP2(aRect, aFormat, scaleFunc);
     }
     VBOXQGLLOG(("VBoxVHWATexture\n"));
-    return new VBoxVHWATexture(aRect, aFormat);
+    return new VBoxVHWATexture(aRect, aFormat, scaleFunc);
 }
 
@@ -1217 +1218 @@
     resetDefaultSrcOverlayCKey();
 
-    mImage = vboxVHWAImageCreate(QRect(0,0,aSize.width(),aSize.height()), aColorFormat, getGlProgramMngr(), bVGA ? 0 : (VBOXVHWAIMG_PBO | VBOXVHWAIMG_PBOIMG /*| VBOXVHWAIMG_FBO*/));
+    mImage = vboxVHWAImageCreate(QRect(0,0,aSize.width(),aSize.height()), aColorFormat, getGlProgramMngr(), bVGA ? 0 : (VBOXVHWAIMG_PBO | VBOXVHWAIMG_PBOIMG | VBOXVHWAIMG_FBO));
 
     setRectValues(aTargRect, aSrcRect);
@@ -1438 +1439 @@
 }
 
-VBoxVHWATexture::VBoxVHWATexture(const QRect & aRect, const VBoxVHWAColorFormat &aFormat) :
+VBoxVHWATexture::VBoxVHWATexture(const QRect & aRect, const VBoxVHWAColorFormat &aFormat, GLint scaleFuncttion) :
             mAddress(NULL),
             mTexture(0),
             mBytesPerPixel(0),
             mBytesPerPixelTex(0),
-            mBytesPerLine(0)
+            mBytesPerLine(0),
+            mScaleFuncttion(scaleFuncttion)
 {
     mColorFormat = aFormat;
@@ -1459 +1461 @@
     GLenum tt = texTarget();
 
-    glTexParameteri(tt, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameteri(tt, GL_TEXTURE_MIN_FILTER, mScaleFuncttion);
     VBOXQGL_ASSERTNOERR();
-    glTexParameteri(tt, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glTexParameteri(tt, GL_TEXTURE_MAG_FILTER, mScaleFuncttion);
     VBOXQGL_ASSERTNOERR();
     glTexParameteri(tt, GL_TEXTURE_WRAP_S, GL_CLAMP);

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

@@ -241 +241 @@
             mBytesPerPixel(0),
             mBytesPerPixelTex(0),
-            mBytesPerLine(0)
+            mBytesPerLine(0),
+            mScaleFuncttion(GL_NEAREST)
 {}
-    VBoxVHWATexture(const QRect & aRect, const VBoxVHWAColorFormat &aFormat);
+    VBoxVHWATexture(const QRect & aRect, const VBoxVHWAColorFormat &aFormat, GLint scaleFuncttion);
     virtual ~VBoxVHWATexture();
     virtual void init(uchar *pvMem);
@@ -285 +286 @@
     uint32_t mBytesPerLine;
     VBoxVHWAColorFormat mColorFormat;
+    GLint mScaleFuncttion;
 private:
     void uninit();
@@ -295 +297 @@
 public:
     VBoxVHWATextureNP2() : VBoxVHWATexture() {}
-    VBoxVHWATextureNP2(const QRect & aRect, const VBoxVHWAColorFormat &aFormat) :
-        VBoxVHWATexture(aRect, aFormat){
+    VBoxVHWATextureNP2(const QRect & aRect, const VBoxVHWAColorFormat &aFormat, GLint scaleFuncttion) :
+        VBoxVHWATexture(aRect, aFormat, scaleFuncttion){
         mTexRect = QRect(0, 0, aRect.width()/aFormat.widthCompression(), aRect.height()/aFormat.heightCompression());
     }
@@ -305 +307 @@
 public:
     VBoxVHWATextureNP2Rect() : VBoxVHWATextureNP2() {}
-    VBoxVHWATextureNP2Rect(const QRect & aRect, const VBoxVHWAColorFormat &aFormat) :
-        VBoxVHWATextureNP2(aRect, aFormat){}
+    VBoxVHWATextureNP2Rect(const QRect & aRect, const VBoxVHWAColorFormat &aFormat, GLint scaleFuncttion) :
+        VBoxVHWATextureNP2(aRect, aFormat, scaleFuncttion){}
 
     virtual void texCoord(int x, int y);
@@ -321 +323 @@
         mPBO(0)
     {}
-    VBoxVHWATextureNP2RectPBO(const QRect & aRect, const VBoxVHWAColorFormat &aFormat) :
-        VBoxVHWATextureNP2Rect(aRect, aFormat),
+    VBoxVHWATextureNP2RectPBO(const QRect & aRect, const VBoxVHWAColorFormat &aFormat, GLint scaleFuncttion) :
+        VBoxVHWATextureNP2Rect(aRect, aFormat, scaleFuncttion),
         mPBO(0)
     {}
@@ -344 +346 @@
         mcbOffset(0)
     {}
-    VBoxVHWATextureNP2RectPBOMapped(const QRect & aRect, const VBoxVHWAColorFormat &aFormat) :
-            VBoxVHWATextureNP2RectPBO(aRect, aFormat),
+    VBoxVHWATextureNP2RectPBOMapped(const QRect & aRect, const VBoxVHWAColorFormat &aFormat, GLint scaleFuncttion) :
+            VBoxVHWATextureNP2RectPBO(aRect, aFormat, scaleFuncttion),
             mpMappedAllignedBuffer(NULL),
             mcbOffset(0)
@@ -378 +380 @@
 #define VBOXVHWAIMG_PBOIMG 0x00000002U
 #define VBOXVHWAIMG_FBO    0x00000004U
+#define VBOXVHWAIMG_LINEAR 0x00000008U
 typedef uint32_t VBOXVHWAIMG_TYPE;
 
@@ -1579 +1582 @@
     VBoxVHWATextureImageFBO(const QRect &size, const VBoxVHWAColorFormat &format, class VBoxVHWAGlProgramMngr * aMgr, VBOXVHWAIMG_TYPE flags) :
             T(size, format, aMgr, flags & (~VBOXVHWAIMG_FBO)),
-            mFBOTex(size, VBoxVHWAColorFormat(32, 0xff0000, 0xff00, 0xff), aMgr, flags & (~VBOXVHWAIMG_FBO)),
+            mFBOTex(size, VBoxVHWAColorFormat(32, 0xff0000, 0xff00, 0xff), aMgr, (flags & (~VBOXVHWAIMG_FBO)) | VBOXVHWAIMG_LINEAR),
             mpvFBOTexMem(NULL)
     {