Changeset 84792 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 11, 2020 1:12:17 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: Get rid of 3D testing code in the GUI.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (2 diffs)
• globals/UICommon.h (modified) (2 diffs)
• runtime/UIIndicatorsPool.cpp (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (3 diffs)
• runtime/scale/UIMachineViewScale.cpp (modified) (3 diffs)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (1 diff)
• snapshots/UISnapshotDetailsWidget.cpp (modified) (1 diff)

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

@@ -310 +310 @@
     , m_fWrappersValid(false)
     , m_fVBoxSVCAvailable(true)
-    , m_i3DAvailable(-1)
     , m_pThreadPool(0)
     , m_pThreadPoolCloud(0)
@@ -3732 +3731 @@
 }
 
-bool UICommon::is3DAvailableWorker() const
-{
-    /* Rational is that when starting a text mode guest (like DOS) that does not
-     * have 3D enabled, don't wast the developer's or user's time on launching the
-     * test application when starting the VM or editing it's settings.
-     *
-     * Keep in mind that if we ever end up checking this concurrently on multiple threads,
-     * use a RTONCE construct to serialize the efforts. */
-
-#ifdef VBOX_WITH_3D_ACCELERATION
-    bool fSupported = true;
-#else
-    bool fSupported = false;
-#endif
-    m_i3DAvailable = fSupported;
-    return fSupported;
-}
-
-bool UICommon::is3DAvailable() const
-{
-    if (m_i3DAvailable < 0)
-        return is3DAvailableWorker();
-    return m_i3DAvailable != 0;
-}
-
 #ifdef VBOX_WITH_3D_ACCELERATION
 /* static */

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

@@ -634 +634 @@
     /** @name Display stuff.
      * @{ */
-        /** Inner worker for lazily querying for 3D support. */
-        bool is3DAvailableWorker() const;
-        /** Returns whether 3D is available, runs worker above if necessary. */
-        bool is3DAvailable() const;
-
 #ifdef VBOX_WITH_3D_ACCELERATION
         /** Returns whether guest OS type with passed @a strGuestOSTypeId is WDDM compatible. */
@@ -925 +920 @@
     /** @} */
 
-    /** @name Display stuff.
-     * @{ */
-        /** Holds whether 3D is available. */
-        mutable int  m_i3DAvailable;
-    /** @} */
-
     /** @name Thread stuff.
      * @{ */

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

@@ -762 +762 @@
 
         /* 3D acceleration: */
-        const bool fAcceleration3D = comGraphics.GetAccelerate3DEnabled() && uiCommon().is3DAvailable();
+        const bool fAcceleration3D = comGraphics.GetAccelerate3DEnabled();
         if (fAcceleration3D)
         {

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

@@ -218 +218 @@
 
     /* Propagate the scale-factor related attributes to 3D service if necessary: */
-    if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
+    if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled())
     {
         double dScaleFactorFor3D = dScaleFactor;
@@ -494 +494 @@
 
     /* Propagate the scale-factor related attributes to 3D service if necessary: */
-    if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
+    if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled())
     {
         double dScaleFactorFor3D = dScaleFactor;
@@ -714 +714 @@
 
         /* Propagate the scale-factor related attributes to 3D service if necessary: */
-        if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
+        if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled())
         {
             double dScaleFactorFor3D = dScaleFactor;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

@@ -62 +62 @@
     {
         /* Propagate scale-factor to 3D service if necessary: */
-        if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
+        if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled())
         {
             double xScaleFactor = (double)scaledSize.width()  / frameBuffer()->width();
@@ -121 +121 @@
     {
         /* Propagate scale-factor to 3D service if necessary: */
-        if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
+        if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled())
         {
             double xScaleFactor = (double)scaledSize.width()  / frameBuffer()->width();
@@ -144 +144 @@
     frameBuffer()->setUseUnscaledHiDPIOutput(fUseUnscaledHiDPIOutput);
     /* Propagate unscaled-hidpi-output feature to 3D service if necessary: */
-    if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
+    if (machine().GetGraphicsAdapter().GetAccelerate3DEnabled())
         display().NotifyHiDPIOutputPolicyChange(fUseUnscaledHiDPIOutput);
 

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

@@ -594 +594 @@
 #endif /* VBOX_WITH_3D_ACCELERATION */
         }
-
-#ifdef VBOX_WITH_3D_ACCELERATION
-        /* 3D acceleration test: */
-        if (m_pCheckbox3D->isChecked() && !uiCommon().is3DAvailable())
-        {
-            message.second << tr("The virtual machine is set up to use hardware graphics acceleration. "
-                                 "However the host system does not currently provide this, "
-                                 "so you will not be able to start the machine.");
-        }
-#endif /* VBOX_WITH_3D_ACCELERATION */
 
         /* Graphics controller type test: */

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp

@@ -1719 +1719 @@
     QStringList aReport;
     /* 3D Acceleration? */
-    if (comGraphics.GetAccelerate3DEnabled() && uiCommon().is3DAvailable())
+    if (comGraphics.GetAccelerate3DEnabled())
         aReport << QApplication::translate("UIDetails", "3D", "details (display)");
     /* Compose and return report: */