Changeset 23548 in vbox

Timestamp:

Oct 5, 2009 10:22:25 AM (15 years ago)

Author:

vboxsync

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

53192

Message:

video 2d accel: linux ATI gl context loss fix

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxFBOverlay.h (modified) (2 diffs)
• src/VBoxFBOverlay.cpp (modified) (2 diffs)

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

@@ -1049 +1049 @@
     bool vboxIsInitialized() {return mDisplay.getVGA() != NULL; }
 
+    void vboxDoResize(void *re);
+
 //    void vboxPaintEvent (QPaintEvent *pe) {vboxPerformGLOp(&VBoxGLWidget::vboxDoPaint, pe); }
     void vboxResizeEvent (class VBoxResizeEvent *re) {vboxPerformGLOp(&VBoxGLWidget::vboxDoResize, re); }
 
     void vboxProcessVHWACommands(class VBoxVHWACommandElementProcessor * pPipe) {vboxPerformGLOp(&VBoxGLWidget::vboxDoProcessVHWACommands, pPipe);}
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    void vboxVHWACmd (struct _VBOXVHWACMD * pCmd) {vboxPerformGLOp(&VBoxGLWidget::vboxDoVHWACmd, pCmd);}
-#endif
+
     class VBoxVHWAGlProgramMngr * vboxVHWAGetGlProgramMngr() { return mpMngr; }
 
@@ -1096 +1096 @@
     static void setupMatricies(const QSize &display);
     static void adjustViewport(const QSize &display, const QRect &viewport);
-    void vboxDoResize(void *re);
 //    void vboxDoPaint(void *rec);
 

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

@@ -690 +690 @@
     g_vboxVHWAGlSupportInitialized = true;
 
-    if (!QGLContext(QGLFormat::defaultFormat()).isValid())
-        return;
+//    if (!QGLContext(QGLFormat::defaultFormat()).isValid())
+//        return;
 
     static QGLWidget *pTmpContextHolder = NULL;
@@ -5461 +5461 @@
             mContainer->height());
 
-    mpOverlayWidget->vboxResizeEvent(&re);
+    mpOverlayWidget->vboxDoResize(&re);
     return true;
 }