Changeset 107545 in vbox for trunk

Timestamp:

Jan 8, 2025 5:58:58 PM (10 days ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10767: Reverting r166612 as it was based on wrong assumption.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIGuestOSType.cpp (modified) (1 diff)
• globals/UIGuestOSType.h (modified) (1 diff)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (1 diff)

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

@@ -46 +46 @@
 
 #ifdef VBOX_WITH_3D_ACCELERATION
-bool UIGuestOSTypeHelpers::isXpdmCompatibleOsType(const QString &strGuestOSTypeId)
-{
-    return    strGuestOSTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("WindowsXP"))
-           || strGuestOSTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("WindowsVista"))
-           || strGuestOSTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("Windows7"))
-           || strGuestOSTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("WindowsNT4"))
-           || strGuestOSTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("Windows2000"));
-}
-
 bool UIGuestOSTypeHelpers::isWddmCompatibleOsType(const QString &strGuestOSTypeId)
 {

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

@@ -44 +44 @@
 {
 #ifdef VBOX_WITH_3D_ACCELERATION
-    /** Returns whether guest OS type with passed @a strGuestOSTypeId is XPDM compatible. */
-    SHARED_LIBRARY_STUFF bool isXpdmCompatibleOsType(const QString &strGuestOSTypeId);
     /** Returns whether guest OS type with passed @a strGuestOSTypeId is WDDM compatible. */
     SHARED_LIBRARY_STUFF bool isWddmCompatibleOsType(const QString &strGuestOSTypeId);

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

@@ -639 +639 @@
     /* Validation prerequisites: */
 #ifdef VBOX_WITH_3D_ACCELERATION
-    /* Special handling for Windows guests: */
-    if (m_strGuestOSTypeId.startsWith("Windows"))
-    {
-        switch (graphicsControllerTypeCurrent())
-        {
-            case KGraphicsControllerType_VBoxVGA:
-                m_f3DAccelerationSupported = UIGuestOSTypeHelpers::isXpdmCompatibleOsType(m_strGuestOSTypeId);
-                break;
-            case KGraphicsControllerType_VBoxSVGA:
-                m_f3DAccelerationSupported = UIGuestOSTypeHelpers::isWddmCompatibleOsType(m_strGuestOSTypeId);
-                break;
-            default:
-                break;
-        }
-    }
-    /* For the rest of guests we are using VBoxVGA (old Linuxes) or VMSVGA,
-     * it's difficult to draw the line between various guest OS types, enabling 3D always: */
-    else
-    {
-        switch (graphicsControllerTypeCurrent())
-        {
-            case KGraphicsControllerType_VBoxVGA:
-            case KGraphicsControllerType_VMSVGA:
-                m_f3DAccelerationSupported = true;
-                break;
-            default:
-                m_f3DAccelerationSupported = false;
-                break;
-        }
-    }
+    /* Check whether WDDM mode supported by the guest OS type: */
+    m_f3DAccelerationSupported = UIGuestOSTypeHelpers::isWddmCompatibleOsType(m_strGuestOSTypeId);
 
     /* Additionally make sure 3D acceleration is one of the features for current graphical controller: */