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

Timestamp:

Sep 4, 2024 4:57:58 PM (7 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

Location:

trunk/src/VBox/Main/src-server

Files:

• GraphicsAdapterImpl.cpp (modified) (3 diffs)
• PlatformImpl.cpp (modified) (1 diff)
• SystemPropertiesImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/GraphicsAdapterImpl.cpp

@@ -264 +264 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    /* Validate if the given feature is supported by this graphics controller. */
-    if (!PlatformProperties::s_isGraphicsControllerFeatureSupported(mData->graphicsControllerType, aFeature))
+    /* Validate if the given feature is supported by this graphics controller on the given VM platform. */
+    if (!PlatformProperties::s_isGraphicsControllerFeatureSupported(mParent->i_getPlatform()->i_getArchitecture(),
+                                                                    mData->graphicsControllerType, aFeature))
         return setError(VBOX_E_NOT_SUPPORTED, tr("The graphics controller does not support the given feature"));
 
@@ -305 +306 @@
     switch (aFeature)
     {
-#ifndef VBOX_WITH_VIRT_ARMV8 /* On macOS (ARM) we don't support any 2D/3D acceleration for now. */
         case GraphicsFeature_Acceleration2DVideo:
             pfSetting = &mData->fAccelerate2DVideo;
-            *pfSetting = false; /* @bugref{9691} -- The legacy VHWA acceleration has been disabled completely. */
             break;
 
@@ -314 +313 @@
             pfSetting = &mData->fAccelerate3D;
             break;
-#endif
+
         default:
             break;

trunk/src/VBox/Main/src-server/PlatformImpl.cpp

@@ -850 +850 @@
 }
 
+/**
+ * Internal helper to return the currently set architecture of this platform.
+ *
+ * @returns Currently set architecture.
+ *
+ * @note    Takes the read lock.
+ */
+PlatformArchitecture_T Platform::i_getArchitecture(void)
+{
+    PlatformArchitecture_T enmArchitecture;
+    HRESULT const hrc = getArchitecture(&enmArchitecture);
+    AssertComRCReturn(hrc, PlatformArchitecture_None);
+    return enmArchitecture;
+}
+

trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp

@@ -1153 +1153 @@
 HRESULT SystemProperties::getSupportedGraphicsFeatures(std::vector<GraphicsFeature_T> &aSupportedGraphicsFeatures)
 {
+#if defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64)
     static const GraphicsFeature_T s_aGraphicsFeatures[] =
     {
-#ifdef VBOX_WITH_VIDEOHWACCEL
+# ifdef VBOX_WITH_VIDEOHWACCEL
         GraphicsFeature_Acceleration2DVideo,
-#endif
-#ifdef VBOX_WITH_3D_ACCELERATION
+# endif
+# ifdef VBOX_WITH_3D_ACCELERATION
         GraphicsFeature_Acceleration3D
-#endif
+# endif
     };
     RT_CPP_VECTOR_ASSIGN_ARRAY(aSupportedGraphicsFeatures, s_aGraphicsFeatures);
+#else
+    /* On ARM-based hosts we don't support any 2D/3D acceleration for now.*/
+    aSupportedGraphicsFeatures.clear();
+#endif
 
     return S_OK;