Changeset 71368 in vbox

Timestamp:

Mar 16, 2018 2:32:33 PM (7 years ago)

Author:

vboxsync

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

121320

Message:

FE/Qt: bugref:9049: Detach VBoxGlobal from VBoxQGLOverlay stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (3 diffs)
• runtime/UIMachineWindow.cpp (modified) (2 diffs)
• runtime/UISession.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -86 +86 @@
 #  include "UIMachineWindowSeamless.h"
 # endif /* VBOX_WS_MAC */
-# ifdef VBOX_WITH_VIDEOHWACCEL
-#  include "VBoxFBOverlay.h"
-# endif /* VBOX_WITH_VIDEOHWACCEL */
 
 /* COM includes: */
@@ -3250 +3247 @@
     }
 }
-
-#ifdef VBOX_WITH_VIDEOHWACCEL
-/* static */
-bool VBoxGlobal::isAcceleration2DVideoAvailable()
-{
-    return VBoxQGLOverlay::isAcceleration2DVideoAvailable();
-}
-
-/** additional video memory required for the best 2D support performance
- *  total amount of VRAM required is thus calculated as requiredVideoMemory + required2DOffscreenVideoMemory  */
-/* static */
-quint64 VBoxGlobal::required2DOffscreenVideoMemory()
-{
-    return VBoxQGLOverlay::required2DOffscreenVideoMemory();
-}
-
-#endif
 
 #ifdef VBOX_WITH_CRHGSMI

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -418 +418 @@
     static QString documentsPath();
 
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    static bool isAcceleration2DVideoAvailable();
-
-    /** additional video memory required for the best 2D support performance
-     *  total amount of VRAM required is thus calculated as requiredVideoMemory + required2DOffscreenVideoMemory  */
-    static quint64 required2DOffscreenVideoMemory();
-#endif
-
 #ifdef VBOX_WITH_CRHGSMI
     static bool isWddmCompatibleOsType(const QString &strGuestOSTypeId);
@@ -507 +499 @@
 
 #ifdef VBOX_WS_WIN
-    /** Wraps WinAPI ShutdownBlockReasonCreate function.
-      * @remark  This function defined starting from Vista only. */
+    /** Wraps WinAPI ShutdownBlockReasonCreate function. */
     static BOOL ShutdownBlockReasonCreateAPI(HWND hWnd, LPCWSTR pwszReason);
 #endif
@@ -599 +590 @@
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
-    /** Whether the debugger should be accessible or not.
-     * Use --dbg, the env.var. VBOX_GUI_DBG_ENABLED,
-     *     --debug or the env.var. VBOX_GUI_DBG_AUTO_SHOW to enable. */
+    /** Whether the debugger should be accessible or not. */
     mutable int m_fDbgEnabled;
-    /** Whether to show the debugger automatically with the console.
-     * Use --debug or the env.var. VBOX_GUI_DBG_AUTO_SHOW to enable. */
+    /** Whether to show the debugger automatically with the console. */
     mutable int m_fDbgAutoShow;
     /** Whether to show the command line window when m_fDbgAutoShow is set. */

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

@@ -44 +44 @@
 # include "UIMouseHandler.h"
 # include "UIVMCloseDialog.h"
+# include "VBoxFBOverlay.h"
 
 /* COM includes: */
@@ -463 +464 @@
 #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() && VBoxQGLOverlay::isAcceleration2DVideoAvailable();
 #endif /* VBOX_WITH_VIDEOHWACCEL */
 

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

@@ -248 +248 @@
     /* Log whether 2D video acceleration is enabled: */
     LogRel(("GUI: 2D video acceleration is %s\n",
-           machine().GetAccelerate2DVideoEnabled() && VBoxGlobal::isAcceleration2DVideoAvailable()
+           machine().GetAccelerate2DVideoEnabled() && VBoxQGLOverlay::isAcceleration2DVideoAvailable()
            ? "enabled" : "disabled"));
 #endif /* VBOX_WITH_VIDEOHWACCEL */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -28 +28 @@
 # include "UIErrorString.h"
 # include "VBoxGlobal.h"
+# include "VBoxFBOverlay.h"
 
 /* COM includes: */
@@ -520 +521 @@
             else if (m_pCheckbox2DVideo->isChecked() && m_f2DVideoAccelerationSupported)
             {
-                uNeedBytes += VBoxGlobal::required2DOffscreenVideoMemory();
+                uNeedBytes += VBoxQGLOverlay::required2DOffscreenVideoMemory();
                 if ((quint64)m_pEditorVideoMemorySize->value() * _1M < uNeedBytes)
                 {
@@ -694 +695 @@
     m_pCheckbox3D->setEnabled(isMachineOffline());
 #ifdef VBOX_WITH_VIDEOHWACCEL
-    m_pCheckbox2DVideo->setEnabled(isMachineOffline() && VBoxGlobal::isAcceleration2DVideoAvailable());
+    m_pCheckbox2DVideo->setEnabled(isMachineOffline() && VBoxQGLOverlay::isAcceleration2DVideoAvailable());
 #else /* !VBOX_WITH_VIDEOHWACCEL */
     m_pCheckbox2DVideo->hide();
@@ -1206 +1207 @@
     if (m_pCheckbox2DVideo->isChecked() && m_f2DVideoAccelerationSupported)
     {
-        uNeedMBytes += VBoxGlobal::required2DOffscreenVideoMemory() / _1M;
+        uNeedMBytes += VBoxQGLOverlay::required2DOffscreenVideoMemory() / _1M;
     }
 #endif