Changeset 39065 in vbox for trunk/src/VBox

Timestamp:

Oct 20, 2011 9:47:43 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: do not re-create the framebuffer on every view switch (done for SDL too).

File:

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

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

@@ -311 +311 @@
 #ifdef VBOX_GUI_USE_SDL
         case VBoxDefs::SDLMode:
+        {
             /* Indicate that we are doing all drawing stuff ourself: */
             // TODO_NEW_CORE
@@ -318 +319 @@
             XFlush(QX11Info::display());
 # endif /* Q_WS_X11 */
+            UIFrameBuffer* pFrameBuffer = uisession()->frameBuffer(screenId());
+            if (pFrameBuffer)
+                pFrameBuffer->setView(this);
+            else
+            {
 # if defined(VBOX_WITH_VIDEOHWACCEL) && defined(DEBUG_misha) /* not tested yet */
-            if (m_fAccelerate2DVideo)
-            {
-                class 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<UIFrameBufferSDL, UIMachineView, UIResizeEvent>(this, &machineWindowWrapper()->session(), (uint32_t)screenId());
-                    uisession()->setFrameBuffer(screenId(), pFramebuffer);
-                }
-                m_pFrameBuffer = pFramebuffer;
-            }
-            else
-                m_pFrameBuffer = new UIFrameBufferSDL(this);
-# else
-            m_pFrameBuffer = new UIFrameBufferSDL(this);
-# endif
+                    pFrameBuffer = new UIFrameBufferSDL(this);
+# else /* VBOX_WITH_VIDEOHWACCEL */
+                pFrameBuffer = new UIFrameBufferSDL(this);
+# endif /* !VBOX_WITH_VIDEOHWACCEL */
+                uisession()->setFrameBuffer(screenId(), pFrameBuffer);
+            }
+            m_pFrameBuffer = pFrameBuffer;
             /* Disable scrollbars because we cannot correctly draw in a scrolled window using SDL: */
             horizontalScrollBar()->setEnabled(false);
             verticalScrollBar()->setEnabled(false);
             break;
+        }
 #endif /* VBOX_GUI_USE_SDL */
 #if 0 // TODO: Enable DDraw frame buffer!
@@ -503 +506 @@
         QApplication::sendPostedEvents(this, VBoxDefs::ResizeEventType);
         if (   m_fAccelerate2DVideo
-            || vboxGlobal().vmRenderMode() == VBoxDefs::QImageMode)
+            || vboxGlobal().vmRenderMode() == VBoxDefs::QImageMode
+            || vboxGlobal().vmRenderMode() == VBoxDefs::SDLMode)
         {
             Assert(m_pFrameBuffer == uisession()->frameBuffer(screenId()));