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

Timestamp:

Aug 10, 2009 7:41:53 PM (15 years ago)

Author:

vboxsync

Message:

video hw accel: make enable/disble flag be honored properly

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (1 diff)

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

@@ -753 +753 @@
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
-    static bool isAcceleration2DVideoAvailable() {/*TODO: */ return true;}
+    static bool isAcceleration2DVideoAvailable() {/*TODO: */ return true; }
+    VBoxDefs::RenderMode vmAcceleration2DVideoRenderMode() { return VBoxDefs::QGLMode; }
 #endif
 

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

@@ -807 +807 @@
     AssertWrapperOk (csession);
 
+    CMachine cmachine = csession.GetMachine();
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    /* need to force the QGL framebuffer in case 2D Video Acceleration is enabled && supported */
+    if(cmachine.GetAccelerate2DVideoEnabled() && VBoxGlobal::isAcceleration2DVideoAvailable())
+    {
+        mode = vboxGlobal().vmAcceleration2DVideoRenderMode();
+    }
+#endif
+
     console = new VBoxConsoleView (this, cconsole, mode, centralWidget());
     static_cast <QGridLayout*> (centralWidget()->layout())->addWidget (console, 1, 1, Qt::AlignVCenter | Qt::AlignHCenter);
-
-    CMachine cmachine = csession.GetMachine();
 
     /* Mini toolbar */

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

@@ -546 +546 @@
 #endif
     }
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    /* temporary hack to enable QGL mode */
-    mode = VBoxDefs::QGLMode;
-#endif
+
     return mode;
-
 }