Changeset 105959 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Sep 4, 2024 4:57:58 PM (8 months ago)

Author:

vboxsync

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

164698

Message:

Main: (Hopefully) Made it more clear which graphics features are supported in which context (guests / hosts): For system properties we now expose features based on the current host platform, whereas in platform properties we expose features on a per-graphics adapter and VM platform combination. bugref:10749

File:

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

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

@@ -830 +830 @@
  *
  * @returns VBox status code.
+ * @param   enmArchitecture              Platform architecture to query a feature for.
  * @param   enmController                Graphics controller to return supported features for.
  * @param   vecSupportedGraphicsFeatures Returned features on success.
  */
 /* static */
-int PlatformProperties::s_getSupportedGraphicsControllerFeatures(GraphicsControllerType_T enmController,
+int PlatformProperties::s_getSupportedGraphicsControllerFeatures(PlatformArchitecture_T enmArchitecture,
+                                                                 GraphicsControllerType_T enmController,
                                                                  std::vector<GraphicsFeature_T> &vecSupportedGraphicsFeatures)
 {
-    switch (enmController)
-    {
+   switch (enmArchitecture)
+    {
+        case PlatformArchitecture_x86:
+        {
+            switch (enmController)
+            {
 #ifdef VBOX_WITH_VMSVGA
-        case GraphicsControllerType_VBoxSVGA:
-        {
-            static const GraphicsFeature_T s_aGraphicsFeatures[] =
-            {
+                case GraphicsControllerType_VBoxSVGA:
+                {
+                    static const GraphicsFeature_T s_aGraphicsFeatures[] =
+                    {
 # ifdef VBOX_WITH_VIDEOHWACCEL
-                GraphicsFeature_Acceleration2DVideo,
+                        GraphicsFeature_Acceleration2DVideo,
 # endif
 # ifdef VBOX_WITH_3D_ACCELERATION
-                GraphicsFeature_Acceleration3D
+                        GraphicsFeature_Acceleration3D
 # endif
-            };
-            RT_CPP_VECTOR_ASSIGN_ARRAY(vecSupportedGraphicsFeatures, s_aGraphicsFeatures);
-            break;
-        }
+                    };
+                    RT_CPP_VECTOR_ASSIGN_ARRAY(vecSupportedGraphicsFeatures, s_aGraphicsFeatures);
+                    break;
+                }
 #endif
-        case GraphicsControllerType_VBoxVGA:
-            RT_FALL_THROUGH();
-        case GraphicsControllerType_QemuRamFB:
-        {
-            static const GraphicsFeature_T s_aGraphicsFeatures[] =
-            {
-                GraphicsFeature_None
-            };
-            RT_CPP_VECTOR_ASSIGN_ARRAY(vecSupportedGraphicsFeatures, s_aGraphicsFeatures);
-            break;
-        }
-
-        default:
-            return VERR_INVALID_PARAMETER;
+                case GraphicsControllerType_VBoxVGA:
+                    RT_FALL_THROUGH();
+                case GraphicsControllerType_QemuRamFB:
+                {
+                    vecSupportedGraphicsFeatures.clear(); /* None supported. */
+                    break;
+                }
+
+                default:
+                {
+                    AssertFailedStmt(vecSupportedGraphicsFeatures.clear());
+                    return VERR_INVALID_PARAMETER;
+                }
+            }
+
+            break;
+        }
+
+        case PlatformArchitecture_ARM:
+        {
+            vecSupportedGraphicsFeatures.clear(); /* None supported. */
+            break;
+        }
+
+        default:
+            break;
     }
 
@@ -878 +896 @@
  *
  * @returns \c true if the given feature is supported, or \c false if not.
+ * @param   enmArchitecture         Platform architecture to query a feature for.
  * @param   enmController           Graphics controlller to query a feature for.
  * @param   enmFeature              Feature to query.
  */
 /* static */
-bool PlatformProperties::s_isGraphicsControllerFeatureSupported(GraphicsControllerType_T enmController, GraphicsFeature_T enmFeature)
+bool PlatformProperties::s_isGraphicsControllerFeatureSupported(PlatformArchitecture_T enmArchitecture, GraphicsControllerType_T enmController, GraphicsFeature_T enmFeature)
 {
     std::vector<GraphicsFeature_T> vecSupportedGraphicsFeatures;
-    int vrc = PlatformProperties::s_getSupportedGraphicsControllerFeatures(enmController, vecSupportedGraphicsFeatures);
+    int vrc = PlatformProperties::s_getSupportedGraphicsControllerFeatures(enmArchitecture, enmController, vecSupportedGraphicsFeatures);
     if (RT_SUCCESS(vrc))
         return std::find(vecSupportedGraphicsFeatures.begin(),
@@ -990 +1009 @@
                                                            std::vector<GraphicsFeature_T> &aSupportedGraphicsFeatures)
 {
-    int vrc = PlatformProperties::s_getSupportedGraphicsControllerFeatures(aGraphicsControllerType, aSupportedGraphicsFeatures);
+    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);