Changeset 37494 in vbox

Timestamp:

Jun 16, 2011 1:30:56 PM (14 years ago)

Author:

vboxsync

Message:

2d/win: disable ogl stuff delay loading to workaround qgl lib misbehave

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/VBoxFBOverlay.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -228 +228 @@
 endif
 
-if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
- VirtualBox_LDFLAGS.win += /DelayLoad:QtOpenGLVBox4.dll /DelayLoad:OPENGL32.dll
-endif
+# delay loading causes VM process crashes due to the misbehave of the current QtOpenGLVBox4.dll we use 
+# (i.e. it does not create the ogl context properly when loaded this way)
+#
+# @todo: investigate a better work-around and enable back delay loading since it is needed to avoid
+# crashes caused by buggy ogl drivers for the case 2D is not used (i.e. no ogl stuff loaded)  
+#if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
+# VirtualBox_LDFLAGS.win += /DelayLoad:QtOpenGLVBox4.dll /DelayLoad:OPENGL32.dll
+#endif
 
 VirtualBox_LDFLAGS.darwin = \

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

@@ -1954 +1954 @@
         mAllowDoneCurrent(true)
     {
+        makeCurrent();
     }