Changeset 39063 in vbox

Timestamp:

Oct 20, 2011 4:41:44 PM (13 years ago)

Author:

vboxsync

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

74485

Message:

FE/Qt: do not re-create the framebuffer on every view switch (only implemented for QImage so far).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIFrameBuffer.cpp (modified) (3 diffs)
• UIMachineView.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -159 +159 @@
 
     NOREF(uScreenId);
-    QApplication::postEvent (m_pMachineView,
-                             new UIResizeEvent(uPixelFormat, pVRAM, uBitsPerPixel,
-                                               uBytesPerLine, uWidth, uHeight));
+    /* A resize event can happen while we are switching machine view classes,
+     * but we synchronise afterwards so that shouldn't be a problem.  We must
+     * temporarily remove the framebuffer in Display though while switching
+     * to respect the thread synchronisation logic (see UIFrameBuffer.h). */
+    if (m_pMachineView)
+        QApplication::postEvent(m_pMachineView,
+                                new UIResizeEvent(uPixelFormat, pVRAM,
+                                                  uBitsPerPixel, uBytesPerLine,
+                                                  uWidth, uHeight));
+    else
+    {
+        /* Report to the VM thread that we finished resizing and rely on the
+         * synchronisation when the new view is attached. */
+        *pbFinished = TRUE;
+        return S_OK;
+    }
 
     *pbFinished = FALSE;
@@ -250 +263 @@
     AssertBreakpoint();
 }
+#endif
 
 void UIFrameBuffer::setView(UIMachineView * pView)
@@ -256 +270 @@
     m_WinId = (m_pMachineView && m_pMachineView->viewport()) ? (LONG64)m_pMachineView->viewport()->winId() : 0;
 }
-#endif

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -276 +276 @@
 #ifdef VBOX_GUI_USE_QIMAGE
         case VBoxDefs::QImageMode:
+        {
+            UIFrameBuffer* pFrameBuffer = uisession()->frameBuffer(screenId());
+            if (pFrameBuffer)
+                pFrameBuffer->setView(this);
+            else
+            {
 # ifdef VBOX_WITH_VIDEOHWACCEL
-            if (m_fAccelerate2DVideo)
-            {
-                UIFrameBuffer* pFramebuffer = uisession()->frameBuffer(screenId());
-                if (pFramebuffer)
-                    pFramebuffer->setView(this);
+                if (m_fAccelerate2DVideo)
+                {
+                    /** these two additional template args is a workaround to
+                     * this [VBox|UI] duplication
+                     * @todo: they are to be removed once VBox stuff is gone */
+                    pFrameBuffer = new VBoxOverlayFrameBuffer<UIFrameBufferQImage, UIMachineView, UIResizeEvent>(this, &machineWindowWrapper()->session(), (uint32_t)screenId());
+                }
                 else
-                {
-                    /* these two additional template args is a workaround to this [VBox|UI] duplication
-                     * @todo: they are to be removed once VBox stuff is gone */
-                    pFramebuffer = new VBoxOverlayFrameBuffer<UIFrameBufferQImage, UIMachineView, UIResizeEvent>(this, &machineWindowWrapper()->session(), (uint32_t)screenId());
-                    uisession()->setFrameBuffer(screenId(), pFramebuffer);
-                }
-                m_pFrameBuffer = pFramebuffer;
-            }
-            else
-                m_pFrameBuffer = new UIFrameBufferQImage(this);
+                    pFrameBuffer = new UIFrameBufferQImage(this);
 # else /* VBOX_WITH_VIDEOHWACCEL */
-            m_pFrameBuffer = new UIFrameBufferQImage(this);
+                pFrameBuffer = new UIFrameBufferQImage(this);
 # endif /* !VBOX_WITH_VIDEOHWACCEL */
-            break;
+                uisession()->setFrameBuffer(screenId(), pFrameBuffer);
+            }
+            m_pFrameBuffer = pFrameBuffer;
+            break;
+        }
 #endif /* VBOX_GUI_USE_QIMAGE */
 #ifdef VBOX_GUI_USE_QGLFB
@@ -393 +396 @@
         CDisplay display = session().GetConsole().GetDisplay();
         Assert(!display.isNull());
-#ifdef VBOX_WITH_VIDEOHWACCEL
         CFramebuffer fb(NULL);
-        if (m_fAccelerate2DVideo)
-        {
-            LONG XOrigin, YOrigin;
-            /* Check if the framebuffer is already assigned;
-             * in this case we do not need to re-assign it neither do we need to AddRef. */
-            display.GetFramebuffer(m_uScreenId, fb, XOrigin, YOrigin);
-        }
-        if (fb.raw() != m_pFrameBuffer) /* <-this will evaluate to true iff m_fAccelerate2DVideo is disabled or iff no framebuffer is yet assigned */
-#endif /* VBOX_WITH_VIDEOHWACCEL */
+        LONG XOrigin, YOrigin;
+        /* Check if the framebuffer is already assigned;
+         * in this case we do not need to re-assign it neither do we need to AddRef. */
+        display.GetFramebuffer(m_uScreenId, fb, XOrigin, YOrigin);
+        if (fb.raw() != m_pFrameBuffer) /* <-this will evaluate to true iff no framebuffer is yet assigned */
         {
             m_pFrameBuffer->AddRef();
@@ -504 +502 @@
         /* Process pending frame-buffer resize events: */
         QApplication::sendPostedEvents(this, VBoxDefs::ResizeEventType);
-#ifdef VBOX_WITH_VIDEOHWACCEL
-        if (m_fAccelerate2DVideo)
-        {
-            /* When 2D is enabled we do not re-create Framebuffers. This is done to
-             * 1. avoid 2D command loss during the time slot when no framebuffer is assigned to the display
-             * 2. make it easier to preserve the current 2D state */
+        if (   m_fAccelerate2DVideo
+            || vboxGlobal().vmRenderMode() == VBoxDefs::QImageMode)
+        {
             Assert(m_pFrameBuffer == uisession()->frameBuffer(screenId()));
+            CDisplay display = session().GetConsole().GetDisplay();
+            /* Temporarily remove the framebuffer in Display while unsetting
+             * the view in order to respect the thread synchonisation logic
+             * (see UIFrameBuffer.h). */
+            /** @note VBOX_WITH_CROGL additionally requires us to call
+             * SetFramebuffer to ensure 3D gets notified of view being
+             * destroyed */
+            display.SetFramebuffer(m_uScreenId, CFramebuffer(NULL));
             m_pFrameBuffer->setView(NULL);
-#ifdef VBOX_WITH_CROGL
-            /* Call SetFramebuffer to ensure 3D gets notified of view being destroyed */
-            CDisplay display = session().GetConsole().GetDisplay();
             display.SetFramebuffer(m_uScreenId, CFramebuffer(m_pFrameBuffer));
-#endif
         }
         else
-#endif /* VBOX_WITH_VIDEOHWACCEL */
         {
             /* Warn framebuffer about its no more necessary: */