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

Timestamp:

Oct 24, 2011 8:44:38 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: do not re-create the framebuffer on every view switch (untested Quartz2D code).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (2 diffs)

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

@@ -362 +362 @@
 #ifdef VBOX_GUI_USE_QUARTZ2D
         case VBoxDefs::Quartz2DMode:
+        {
             /* Indicate that we are doing all drawing stuff ourself: */
             viewport()->setAttribute(Qt::WA_PaintOnScreen);
+            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<UIFrameBufferSDL, 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<UIFrameBufferQuartz2D, UIMachineView, UIResizeEvent>(this, &machineWindowWrapper()->session(), (uint32_t)screenId());
-                    uisession()->setFrameBuffer(screenId(), pFramebuffer);
-                }
-                m_pFrameBuffer = pFramebuffer;
+                    pFrameBuffer = new UIFrameBufferSDL(this);
+# else /* VBOX_WITH_VIDEOHWACCEL */
+                pFrameBuffer = new UIFrameBufferSDL(this);
+# endif /* !VBOX_WITH_VIDEOHWACCEL */
+                uisession()->setFrameBuffer(screenId(), pFrameBuffer);
             }
-            else
-                m_pFrameBuffer = new UIFrameBufferQuartz2D(this);
-# else /* VBOX_WITH_VIDEOHWACCEL */
-            m_pFrameBuffer = new UIFrameBufferQuartz2D(this);
-# endif /* !VBOX_WITH_VIDEOHWACCEL */
-            break;
+            m_pFrameBuffer = pFrameBuffer;
+            break;
+        }
 #endif /* VBOX_GUI_USE_QUARTZ2D */
         default:
@@ -505 +508 @@
         /* Process pending frame-buffer resize events: */
         QApplication::sendPostedEvents(this, VBoxDefs::ResizeEventType);
-        if (   vboxGlobal().vmRenderMode() == VBoxDefs::QImageMode
+        if (   0
+#ifdef VBOX_GUI_USE_QIMAGE
+            || vboxGlobal().vmRenderMode() == VBoxDefs::QImageMode
+#endif
+#ifdef VBOX_GUI_USE_SDL
             || vboxGlobal().vmRenderMode() == VBoxDefs::SDLMode
+#endif
+#ifdef VBOX_GUI_USE_QUARTZ2D
+            || vboxGlobal().vmRenderMode() == VBoxDefs::Quartz2DMode)
+#endif
 #ifdef VBOX_WITH_VIDEOHWACCEL
             || m_fAccelerate2DVideo