Changeset 106080 in vbox

Timestamp:

Sep 18, 2024 12:38:27 PM (4 months ago)

Author:

vboxsync

Message:

Main: Fixed enabling 3D when selecting supported graphics controllers. bugref:10749

Location:

trunk/src/VBox/Main

Files:

• include/GraphicsAdapterImpl.h (modified) (1 diff)
• src-all/PlatformPropertiesImpl.cpp (modified) (1 diff)
• src-server/GraphicsAdapterImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/include/GraphicsAdapterImpl.h

@@ -62 +62 @@
     HRESULT i_saveSettings(settings::GraphicsAdapter &data);
 
-    void i_rollback();
-    void i_commit();
-    void i_copyFrom(GraphicsAdapter *aThat);
+    void  i_rollback();
+    void  i_commit();
+    void  i_copyFrom(GraphicsAdapter *aThat);
+    bool *i_getFeatureMemberBool(GraphicsFeature_T aFeature);
+    void  i_updateFeatures();
 
 private:

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

@@ -848 +848 @@
             {
 #ifdef VBOX_WITH_VMSVGA
+                case GraphicsControllerType_VMSVGA:
+                    RT_FALL_THROUGH();
                 case GraphicsControllerType_VBoxSVGA:
                 {

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

@@ -211 +211 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mParent->i_setModified(Machine::IsModified_GraphicsAdapter);
-    mData.backup();
-    mData->graphicsControllerType = aGraphicsControllerType;
+    if (mData->graphicsControllerType != aGraphicsControllerType)
+    {
+        mParent->i_setModified(Machine::IsModified_GraphicsAdapter);
+        mData.backup();
+        mData->graphicsControllerType = aGraphicsControllerType;
+
+        i_updateFeatures();
+    }
 
     return S_OK;
@@ -264 +269 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    /* 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))
+    /* Validate if the given feature to be enabled is supported by this graphics controller on the given VM platform.
+     * Disabling always is allowed for all graphics controllers. */
+    if (   aEnabled
+        && !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"));
 
-    bool *pfSetting = NULL;
-    switch (aFeature)
-    {
-        case GraphicsFeature_Acceleration2DVideo:
-            pfSetting = &mData->fAccelerate2DVideo;
-            break;
-
-        case GraphicsFeature_Acceleration3D:
-            pfSetting = &mData->fAccelerate3D;
-            break;
-
-        default:
-            break;
-    }
-
+
+    bool *pfSetting = i_getFeatureMemberBool(aFeature);
     if (!pfSetting)
         return setError(E_NOTIMPL, tr("The given feature is not implemented"));
@@ -292 +286 @@
         mData.backup();
 
-        *pfSetting = RT_BOOL(aEnabled);
+        /* Note: We have to re-evaluate the feature member here, as mData.backup() above changed the pointers. */
+        *i_getFeatureMemberBool(aFeature) = RT_BOOL(aEnabled);
     }
 
@@ -385 +380 @@
     mData.assignCopy(&data);
 
+    i_updateFeatures();
+
     return S_OK;
 }
@@ -474 +471 @@
     mData.assignCopy(aThat->mData);
 }
-/* vi: set tabstop=4 shiftwidth=4 expandtab: */
+
+/**
+ * Returns the pointer to a boolean feature member of a given graphics feature.
+ *
+ * @returns Pointer to a boolean feature member of a given graphics feature, or NULL if not found / implemented.
+ * @param   aFeature            Graphics feature to return boolean feature member for.
+ */
+bool *GraphicsAdapter::i_getFeatureMemberBool(GraphicsFeature_T aFeature)
+{
+    switch (aFeature)
+    {
+        case GraphicsFeature_Acceleration2DVideo: return &mData->fAccelerate2DVideo;
+        case GraphicsFeature_Acceleration3D:      return &mData->fAccelerate3D;
+        default:
+            break;
+    }
+
+    return NULL;
+}
+
+/**
+ * Updates all enabled features for the currently set graphics controller type.
+ *
+ * This will disable enabled features if the currently set graphics controller type does not support it.
+ */
+void GraphicsAdapter::i_updateFeatures()
+{
+    struct FEATUREMEMBER2ENUM
+    {
+        bool             *pfFeatureMember;
+        GraphicsFeature_T enmFeature;
+    };
+
+    static FEATUREMEMBER2ENUM s_aFeatures[] =
+    {
+        { &mData->fAccelerate2DVideo, GraphicsFeature_Acceleration2DVideo },
+        { &mData->fAccelerate3D,      GraphicsFeature_Acceleration3D },
+    };
+
+    for (size_t i = 0; i < RT_ELEMENTS(s_aFeatures); i++)
+    {
+        if (*s_aFeatures[i].pfFeatureMember)
+            *s_aFeatures[i].pfFeatureMember
+                = PlatformProperties::s_isGraphicsControllerFeatureSupported(mParent->i_getPlatform()->i_getArchitecture(),
+                                                                             mData->graphicsControllerType,
+                                                                             s_aFeatures[i].enmFeature);
+    }
+}
+