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

Timestamp:

Oct 31, 2024 2:41:09 PM (6 months ago)

Author:

vboxsync

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

165711

Message:

FE/Qt: bugref:10767: VM settings / Display page: Make sure 3D acceleration check-box is enabled/disabled if supported or not by guest OS type.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsDisplay.cpp (modified) (5 diffs)
• UIMachineSettingsDisplay.h (modified) (1 diff)

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

@@ -304 +304 @@
     : m_strGuestOSTypeId(QString())
 #ifdef VBOX_WITH_3D_ACCELERATION
-    , m_fWddmModeSupported(false)
+    , m_f3DAccelerationSupported(false)
 #endif
     , m_enmGraphicsControllerTypeRecommended(KGraphicsControllerType_Null)
@@ -340 +340 @@
     m_pEditorVideoMemorySize->setGuestOSTypeId(m_strGuestOSTypeId);
 
-#ifdef VBOX_WITH_3D_ACCELERATION
-    /* Check if WDDM mode supported by the guest OS type: */
-    m_fWddmModeSupported = UIGuestOSTypeHelpers::isWddmCompatibleOsType(m_strGuestOSTypeId);
-    m_pEditorVideoMemorySize->set3DAccelerationSupported(m_fWddmModeSupported);
-#endif /* VBOX_WITH_3D_ACCELERATION */
     /* Acquire recommended graphics controller type: */
     m_enmGraphicsControllerTypeRecommended =
         gpGlobalSession->guestOSTypeManager().getRecommendedGraphicsController(m_strGuestOSTypeId);
+
     /* Revalidate: */
     revalidate();
@@ -640 +636 @@
     bool fPass = true;
 
+    /* Validation prerequisites: */
+#ifdef VBOX_WITH_3D_ACCELERATION
+    /* Check whether WDDM mode supported by the guest OS type: */
+    m_f3DAccelerationSupported = UIGuestOSTypeHelpers::isWddmCompatibleOsType(m_strGuestOSTypeId);
+
+    /* Pass whether 3D acceleration is supported into Video Memory Editor: */
+    m_pEditorVideoMemorySize->set3DAccelerationSupported(m_f3DAccelerationSupported);
+    /* Enable/disable 3D acceleration check-box accordingly: */
+    m_pEditorDisplayScreenFeatures->setEnabled(isMachineOffline() && m_f3DAccelerationSupported);
+#endif /* VBOX_WITH_3D_ACCELERATION */
+
     /* Screen tab: */
     {
@@ -660 +667 @@
 #ifdef VBOX_WITH_3D_ACCELERATION
             /* 3D acceleration video RAM amount test: */
-            else if (m_pEditorDisplayScreenFeatures->isEnabled3DAcceleration() && m_fWddmModeSupported)
+            else if (m_f3DAccelerationSupported && m_pEditorDisplayScreenFeatures->isEnabled3DAcceleration())
             {
                 uNeedBytes = qMax(uNeedBytes, (quint64) 128 * _1M);
@@ -680 +687 @@
             {
 #ifdef VBOX_WITH_3D_ACCELERATION
-                if (m_pEditorDisplayScreenFeatures->isEnabled3DAcceleration())
+                if (m_f3DAccelerationSupported && m_pEditorDisplayScreenFeatures->isEnabled3DAcceleration())
                     message.second << tr("The virtual machine is configured to use 3D acceleration. This will work only if you "
                                          "pick a different graphics controller (%1). Either disable 3D acceleration or switch "

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

@@ -156 +156 @@
 
     /** Holds the guest OS type. */
-    QString m_strGuestOSTypeId;
-#ifdef VBOX_WITH_3D_ACCELERATION
-    /** Holds whether the guest OS supports WDDM. */
-    bool          m_fWddmModeSupported;
+    QString                  m_strGuestOSTypeId;
+#ifdef VBOX_WITH_3D_ACCELERATION
+    /** Holds whether 3D acceleration supported. */
+    bool                     m_f3DAccelerationSupported;
 #endif
     /** Holds recommended graphics controller type. */