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

Timestamp:

Nov 6, 2009 6:39:07 PM (15 years ago)

Author:

vboxsync

Message:

2d accel: lazy QGLWidget creation to avoid conflicting with 3D on Mac

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

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

@@ -1252 +1252 @@
 
     int reset();
+        
+    void initGl();
 
     VBoxGLWidget *mpOverlayWidget;

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

@@ -798 +798 @@
 #ifdef VBOX_WITH_VIDEOHWACCEL
     /* Need to force the QGL framebuffer in case 2D Video Acceleration is supported & enabled */
-    bool bAccelerate2DVideo = machine.GetAccelerate2DVideoEnabled() && VBoxGlobal::isAcceleration2DVideoAvailable();
+    bool bAccelerate2DVideo = machine.GetAccelerate2DVideoEnabled()
+# ifndef Q_WS_MAC /* @todo: fixme: temporary disable the check on Mac until we move it to a separate app */
+            && VBoxGlobal::isAcceleration2DVideoAvailable()
+# endif
+    ;
 #endif
 

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

@@ -710 +710 @@
 
             mSrcLowerR = 0.0; mSrcLowerG = 0.0; mSrcLowerB = 0.0;
+
             VBOXQGL_CHECKERR(
                     vboxglUniform4f(mUniSrcLowerColor, 0.0, 0.0, 0.0, 0.0);
@@ -2503 +2504 @@
     vboxFormat.setDepth(false);
     Assert(!vboxFormat.depth());
+//  vboxFormat.setRedBufferSize(8);
+//  vboxFormat.setGreenBufferSize(8);
+//  vboxFormat.setBlueBufferSize(8);
     return vboxFormat;
 }
@@ -4276 +4280 @@
 //    Assert(format().alpha());
 //    Assert(format().alphaBufferSize() == 8);
+    VBOXQGLLOG(("format().blueBufferSize()(%d)\n", format().blueBufferSize()));
+    VBOXQGLLOG(("format().greenBufferSize()(%d)\n", format().greenBufferSize()));
+    VBOXQGLLOG(("format().redBufferSize()(%d)\n", format().redBufferSize()));
     Assert(format().blueBufferSize() == 8);
     Assert(format().greenBufferSize() == 8);
@@ -4729 +4736 @@
 
 VBoxQGLOverlay::VBoxQGLOverlay (VBoxConsoleView *aView, VBoxFrameBuffer * aContainer)
-    : mView(aView),
+    : mpOverlayWidget(NULL),
+      mView(aView),
       mContainer(aContainer),
       mGlOn(false),
@@ -4740 +4748 @@
       mCmdPipe(aView)
 {
-    mpOverlayWidget = new VBoxGLWidget (aView, aView->viewport());
-
+    /* postpone the gl widget initialization to avoid conflict with 3D on Mac */
+}
+
+void VBoxQGLOverlay::initGl()
+{
+        if(mpOverlayWidget)
+                return;
+        
+    mpOverlayWidget = new VBoxGLWidget (mView, mView->viewport());
+        
     VBoxGLContext *pc = (VBoxGLContext*)mpOverlayWidget->context();
     pc->allowDoneCurrent(false);
-
+        
     mOverlayWidgetVisible = true; /* to ensure it is set hidden with vboxShowOverlay */
     vboxShowOverlay(false);
-
+        
     mpOverlayWidget->setMouseTracking(true);
-
-//    resizeEvent (new VBoxResizeEvent (FramebufferPixelFormat_Opaque,
-//                                      NULL, 0, 0, 640, 480));
 }
 
@@ -4788 +4801 @@
         }
 
+#ifdef DEBUG
         VBoxVHWACommandElement *pTest = mCmdPipe.detachCmdList(pHead, pTail);
         Assert(!pTest);
         NOREF(pTest);
+#endif
     }
     return VINF_SUCCESS;
@@ -5134 +5149 @@
 {
     struct _VBOXVHWACMD * pCmd = (struct _VBOXVHWACMD *)cmd;
-    makeCurrent();
     switch(pCmd->enmCmd)
     {
@@ -5140 +5154 @@
         {
             VBOXVHWACMD_SURF_CANCREATE * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_CANCREATE);
+            makeCurrent();
             pCmd->rc = mpOverlayWidget->vhwaSurfaceCanCreate(pBody);
         } break;
@@ -5145 +5160 @@
         {
             VBOXVHWACMD_SURF_CREATE * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_CREATE);
+            makeCurrent();
             vboxSetGlOn(true);
             pCmd->rc = mpOverlayWidget->vhwaSurfaceCreate(pBody);
@@ -5165 +5181 @@
         {
             VBOXVHWACMD_SURF_DESTROY * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_DESTROY);
+            makeCurrent();
             pCmd->rc = mpOverlayWidget->vhwaSurfaceDestroy(pBody);
             if(!mpOverlayWidget->hasSurfaces())
@@ -5184 +5201 @@
         {
             VBOXVHWACMD_SURF_LOCK * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_LOCK);
+            makeCurrent();
             pCmd->rc = mpOverlayWidget->vhwaSurfaceLock(pBody);
         } break;
@@ -5189 +5207 @@
         {
             VBOXVHWACMD_SURF_UNLOCK * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_UNLOCK);
+            makeCurrent();
             pCmd->rc = vhwaSurfaceUnlock(pBody);
             /* mNeedOverlayRepaint is set inside the vhwaSurfaceUnlock */
@@ -5195 +5214 @@
         {
             VBOXVHWACMD_SURF_BLT * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_BLT);
+            makeCurrent();
             pCmd->rc = mpOverlayWidget->vhwaSurfaceBlt(pBody);
             mNeedOverlayRepaint = true;
@@ -5201 +5221 @@
         {
             VBOXVHWACMD_SURF_FLIP * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_FLIP);
+            makeCurrent();
             pCmd->rc = mpOverlayWidget->vhwaSurfaceFlip(pBody);
             mNeedOverlayRepaint = true;
@@ -5207 +5228 @@
         {
             VBOXVHWACMD_SURF_OVERLAY_UPDATE * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_OVERLAY_UPDATE);
+            makeCurrent();
             pCmd->rc = mpOverlayWidget->vhwaSurfaceOverlayUpdate(pBody);
             mOverlayVisible = mpOverlayWidget->hasVisibleOverlays();
@@ -5219 +5241 @@
         {
             VBOXVHWACMD_SURF_OVERLAY_SETPOSITION * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_OVERLAY_SETPOSITION);
+            makeCurrent();
             pCmd->rc = mpOverlayWidget->vhwaSurfaceOverlaySetPosition(pBody);
             mOverlayVisible = mpOverlayWidget->hasVisibleOverlays();
@@ -5231 +5254 @@
         {
             VBOXVHWACMD_SURF_COLORKEY_SET * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_SURF_COLORKEY_SET);
+            makeCurrent();
             pCmd->rc = mpOverlayWidget->vhwaSurfaceColorkeySet(pBody);
             mNeedOverlayRepaint = true;
@@ -5237 +5261 @@
         {
             VBOXVHWACMD_QUERYINFO1 * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_QUERYINFO1);
+            initGl();
+            makeCurrent();
             pCmd->rc = mpOverlayWidget->vhwaQueryInfo1(pBody);
         } break;
@@ -5242 +5268 @@
         {
             VBOXVHWACMD_QUERYINFO2 * pBody = VBOXVHWACMD_BODY(pCmd, VBOXVHWACMD_QUERYINFO2);
+            makeCurrent();
             pCmd->rc = mpOverlayWidget->vhwaQueryInfo2(pBody);
         } break;
         case VBOXVHWACMD_TYPE_ENABLE:
+                        initGl();
         case VBOXVHWACMD_TYPE_DISABLE:
             pCmd->rc = VINF_SUCCESS;