Changeset 30752 in vbox

Timestamp:

Jul 8, 2010 10:31:34 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt: New running VM core: Separate viewport creation of frame-buffer creation allow separately re-implement both of them.

Location:

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

Files:

• UIMachineView.cpp (modified) (5 diffs)
• UIMachineView.h (modified) (2 diffs)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (1 diff)
• seamless/UIMachineViewSeamless.cpp (modified) (1 diff)

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

@@ -209 +209 @@
 }
 
-void UIMachineView::prepareFrameBuffer()
+void UIMachineView::prepareViewport()
 {
     /* Prepare viewport: */
@@ -226 +226 @@
 #endif /* !VBOX_GUI_USE_QGLFB */
     setViewport(pViewport);
-
-    CDisplay display = session().GetConsole().GetDisplay();
-    Assert(!display.isNull());
-    m_pFrameBuffer = NULL;
-
+}
+
+void UIMachineView::prepareFrameBuffer()
+{
+    /* Prepare frame-buffer depending on render-mode: */
     switch (vboxGlobal().vmRenderMode())
     {
@@ -345 +345 @@
             break;
     }
+
+    /* If frame-buffer was prepared: */
     if (m_pFrameBuffer)
     {
+        /* Prepare display: */
+        CDisplay display = session().GetConsole().GetDisplay();
+        Assert(!display.isNull());
 #ifdef VBOX_WITH_VIDEOHWACCEL
         CFramebuffer fb(NULL);
@@ -352 +357 @@
         {
             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 */
+            /* 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);
         }
@@ -362 +366 @@
             m_pFrameBuffer->AddRef();
         }
-
-        /* always perform SetFramebuffer to ensure 3D gets notified */
+        /* Always perform SetFramebuffer to ensure 3D gets notified: */
         display.SetFramebuffer(m_uScreenId, CFramebuffer(m_pFrameBuffer));
     }

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

@@ -87 +87 @@
 
     /* Prepare routines: */
+    virtual void prepareViewport();
     virtual void prepareFrameBuffer();
     virtual void prepareCommon();
@@ -99 +100 @@
     //virtual void cleanupCommon() {}
     virtual void cleanupFrameBuffer();
+    //virtual void cleanupViewport();
 
     /* Protected getters: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

@@ -58 +58 @@
     loadMachineViewSettings();
 
+    /* Prepare viewport: */
+    prepareViewport();
+
     /* Prepare frame buffer: */
     prepareFrameBuffer();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

@@ -52 +52 @@
     /* Load machine view settings: */
     loadMachineViewSettings();
+
+    /* Prepare viewport: */
+    prepareViewport();
 
     /* Prepare frame buffer: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

@@ -56 +56 @@
     loadMachineViewSettings();
 
+    /* Prepare viewport: */
+    prepareViewport();
+
     /* Prepare frame buffer: */
     prepareFrameBuffer();