Changeset 106139 in vbox

Timestamp:

Sep 24, 2024 12:52:06 PM (5 months ago)

Author:

vboxsync

Message:

Main/PlatformProperties: Enabled the 3D settings for ARM VMs as well, as per IRC conversation last week. Made PlatformProperties::getSupportedGfxFeaturesForType actually return an error on invalid controller type. bugref:10749

File:

• trunk/src/VBox/Main/src-all/PlatformPropertiesImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-all/PlatformPropertiesImpl.cpp

@@ -841 +841 @@
     vecSupportedGraphicsFeatures.clear();
 
+    /* Note! The legacy VHWA acceleration has been disabled completely (see @bugref{9691}). */
     switch (enmArchitecture)
     {
         case PlatformArchitecture_x86:
+        case PlatformArchitecture_ARM:
         {
             switch (enmController)
             {
+                case GraphicsControllerType_VMSVGA:
+                case GraphicsControllerType_VBoxSVGA:
 #ifdef VBOX_WITH_VMSVGA
-                case GraphicsControllerType_VMSVGA:
-                    RT_FALL_THROUGH();
-                case GraphicsControllerType_VBoxSVGA:
-                {
-#if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_3D_ACCELERATION) /* Work around zero-sized arrays. */
-                    static const GraphicsFeature_T s_aGraphicsFeatures[] =
-                    {
-#  ifdef VBOX_WITH_VIDEOHWACCEL
-                        /* @bugref{9691} -- The legacy VHWA acceleration has been disabled completely. */
-                        //GraphicsFeature_Acceleration2DVideo,
-#  endif
-#  ifdef VBOX_WITH_3D_ACCELERATION
-                        GraphicsFeature_Acceleration3D
-#  endif
-                    };
-                    RT_CPP_VECTOR_ASSIGN_ARRAY(vecSupportedGraphicsFeatures, s_aGraphicsFeatures);
+# ifdef VBOX_WITH_3D_ACCELERATION
+                    vecSupportedGraphicsFeatures.push_back(GraphicsFeature_Acceleration3D);
 # endif
-                    break;
-                }
-#endif /* VBOX_WITH_VMSVGA */
+#endif
+                    return VINF_SUCCESS;
+
                 case GraphicsControllerType_VBoxVGA:
-                    RT_FALL_THROUGH();
                 case GraphicsControllerType_QemuRamFB:
-                {
                     /* None supported. */
-                    break;
-                }
-
-                default:
-                    /* In case GraphicsControllerType_VBoxSVGA is not available. */
+                    return VINF_SUCCESS;
+
+                /* (no default to get compiler warnings) */
+                case GraphicsControllerType_Null:
+#ifdef VBOX_WITH_XPCOM
+                case GraphicsControllerType_32BitHack:
+#endif
                     break;
             }
-
-            break;
-        }
-
-        case PlatformArchitecture_ARM:
-        {
-            /* None supported. */
-            break;
-        }
-
-        default:
-            break;
-    }
-
-    return VINF_SUCCESS;
+            break;
+        }
+
+        /* (no default to get compiler warnings) */
+        case PlatformArchitecture_None:
+#ifdef VBOX_WITH_XPCOM
+        case PlatformArchitecture_32BitHack:
+#endif
+            break;
+    }
+    return VERR_INVALID_PARAMETER;
 }
 
@@ -947 +933 @@
 
         case GraphicsControllerType_VMSVGA:
-            RT_FALL_THROUGH();
         case GraphicsControllerType_VBoxSVGA:
         {
@@ -1019 +1004 @@
     int vrc = PlatformProperties::s_getSupportedGraphicsControllerFeatures(mPlatformArchitecture,
                                                                            aGraphicsControllerType, aSupportedGraphicsFeatures);
-    if (RT_FAILURE(vrc))
-        return setError(E_INVALIDARG, tr("The graphics controller type (%d) is invalid"), aGraphicsControllerType);
-
-    return S_OK;
+    if (RT_SUCCESS(vrc))
+        return S_OK;
+    return setError(E_INVALIDARG, tr("The graphics controller type (%d) is invalid"), aGraphicsControllerType);
 }