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

Timestamp:

Nov 6, 2009 10:44:56 AM (15 years ago)

Author:

vboxsync

Message:

2d accel: simplified coord transformations

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxFBOverlay.h (modified) (1 diff)
• src/VBoxFBOverlay.cpp (modified) (5 diffs)

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

@@ -999 +999 @@
     VBoxVHWASurfaceBase * vboxGetVGASurface() { return mDisplay.getVGA(); }
 
+#ifdef VBOXVHWA_OLD_COORD
     static void doSetupMatrix(const QSize & aSize, bool bInverted);
+#endif
 
     void vboxDoUpdateViewport(const QRect & aRect);

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

@@ -1124 +1124 @@
 //    glEnable(GL_TEXTURE_2D);
     glEnable(GL_TEXTURE_RECTANGLE);
+    glDisable(GL_DEPTH_TEST);
 
     VBOXQGL_CHECKERR(
@@ -2510 +2511 @@
 }
 
-
+#ifdef VBOXVHWA_OLD_COORD
 void VBoxGLWidget::doSetupMatrix(const QSize & aSize, bool bInverted)
 {
@@ -2536 +2537 @@
     }
 }
+#endif
+
 void VBoxGLWidget::adjustViewport(const QSize &display, const QRect &viewport)
 {
+#ifdef VBOXVHWA_OLD_COORD
     /* viewport:  (viewport.x;viewport.y) (viewport.width;viewport.height)*/
     glViewport(-((int)display.width() + viewport.x()),
@@ -2543 +2547 @@
                 2*display.width(),
                 2*display.height());
+#else
+    glViewport(-viewport.x(),
+                   viewport.height() + viewport.y() - display.height(),
+               display.width(),
+               display.height());
+
+#endif
 }
 
 void VBoxGLWidget::setupMatricies(const QSize &display)
 {
+#ifdef VBOXVHWA_OLD_COORD
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
@@ -2554 +2566 @@
     //    doSetupMatrix(bInverted ? &mRect.size() : &mTargSize.size(), bInverted);
     doSetupMatrix(display, false);
+#else
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrtho(0., (GLdouble)display.width(), (GLdouble)display.height(), 0., -1., 1.);
+
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+#endif
 }