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

Timestamp:

Jun 21, 2020 6:41:16 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt,Devices/Graphics: experimental GLX graphics output: use TEXTURE_2D

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (10 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -171 +171 @@
 
     /* The guest texture OpenGL target. */
-    static GLenum const kTextureTarget = GL_TEXTURE_RECTANGLE;
+    static GLenum const kTextureTarget = GL_TEXTURE_2D;
 
     /* The the guest screen source. */
@@ -676 +676 @@
                     GLX_DRAWABLE_TYPE,               GLX_PIXMAP_BIT,         // Must support GLX pixmaps
                     GLX_BIND_TO_TEXTURE_RGBA_EXT,    True,                   // Must support GLX_EXT_texture_from_pixmap
-                    GLX_BIND_TO_TEXTURE_TARGETS_EXT, GLX_TEXTURE_RECTANGLE_BIT_EXT, // Must support GL_TEXTURE_RECTANGLE for the frontend code
+                    GLX_BIND_TO_TEXTURE_TARGETS_EXT, GLX_TEXTURE_2D_BIT_EXT, // Must support GL_TEXTURE_2D because the device creates the pixmap as TEXTURE_2D
                     GLX_DOUBLEBUFFER,                False,                  // No need for double buffering for a pixmap.
                     GLX_RED_SIZE,                    8,                      // True color RGB with 8 bits per channel.
@@ -727 +727 @@
                         static int const aPixmapAttribList[] =
                         {
-                            GLX_TEXTURE_TARGET_EXT, GLX_TEXTURE_RECTANGLE_EXT /* GLX_TEXTURE_2D_EXT */,
+                            GLX_TEXTURE_TARGET_EXT, GLX_TEXTURE_2D_EXT,
                             GLX_TEXTURE_FORMAT_EXT, GLX_TEXTURE_FORMAT_RGBA_EXT,
                             None
@@ -811 +811 @@
 
 /* Whether OpenGL is usable.
- * OpenGL 2.0 and support for GL_TEXTURE_RECTANGLE is required.
+ * OpenGL 2.0 required.
  */
 /* static */ bool GLWidget::isSupported()
@@ -839 +839 @@
 
     /* Check if GL_TEXTURE_RECTANGLE is supported: */
-    bool const fTextureRectangle = contextGL.hasExtension("GL_ARB_texture_rectangle")
-                                || contextGL.hasExtension("GL_NV_texture_rectangle")
-                                || ver >= 31;
+    //bool const fTextureRectangle = contextGL.hasExtension("GL_ARB_texture_rectangle")
+    //                            || contextGL.hasExtension("GL_NV_texture_rectangle")
+    //                            || ver >= 31;
 
     /* Reset the current OpenGL context: */
@@ -847 +847 @@
 
     /* Decide if OpenGL support is good enough: */
-    return ver >= 20 && fTextureRectangle;
+    return ver >= 20 /* && fTextureRectangle */;
 }
 
@@ -986 +986 @@
 
         /* The guest coordinates of the visible guest screen area: */
-        int x1 = m_guestVisibleRect.x();
-        int y1 = m_guestVisibleRect.y();
-        int x2 = x1 + m_guestVisibleRect.width();
-        int y2 = y1 + m_guestVisibleRect.height();
+        float x1 = m_guestVisibleRect.x();
+        float y1 = m_guestVisibleRect.y();
+        float x2 = x1 + m_guestVisibleRect.width();
+        float y2 = y1 + m_guestVisibleRect.height();
+
+        x1 /= (float)m_guestSize.width();
+        y1 /= (float)m_guestSize.height();
+        x2 /= (float)m_guestSize.width();
+        y2 /= (float)m_guestSize.height();
 
         glDisable(GL_DEPTH_TEST); GLCHECK();
@@ -1004 +1009 @@
         /* Draw the texture (upside down, because QImage and OpenGL store the bitmap differently): */
         glBegin(GL_QUADS);
-        glTexCoord2i(x1, y1); glVertex2i(0, h);
-        glTexCoord2i(x1, y2); glVertex2i(0, 0);
-        glTexCoord2i(x2, y2); glVertex2i(w, 0);
-        glTexCoord2i(x2, y1); glVertex2i(w, h);
+        glTexCoord2f(x1, y1); glVertex2i(0, h);
+        glTexCoord2f(x1, y2); glVertex2i(0, 0);
+        glTexCoord2f(x2, y2); glVertex2i(w, 0);
+        glTexCoord2f(x2, y1); glVertex2i(w, h);
         glEnd(); GLCHECK();
 
@@ -1041 +1046 @@
     /* Create a new guest texture, which must be the same size as the guest screen: */
     glGenTextures(1, &m_guestTexture);
+    glEnable(kTextureTarget); GLCHECK();
     glBindTexture(kTextureTarget, m_guestTexture);
     glTexParameteri(kTextureTarget, GL_TEXTURE_MAG_FILTER, filter);
@@ -1051 +1057 @@
     glBindTexture(kTextureTarget, 0);
     GLCHECK();
+    glDisable(kTextureTarget); GLCHECK();
 }