Changeset 104819 in vbox for trunk/src/VBox

Timestamp:

May 30, 2024 9:17:47 AM (6 months ago)

Author:

vboxsync

Message:

Main: Also make use of PlatformPropertiesImpl::s_getSupportedVRAMRange() in GraphicsAdapter::setVRAMSize(); also take the SchemaDefs in PlatformPropertiesImpl::s_getSupportedVRAMRange() into account. bugref:​10693

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -67 +67 @@
     static ULONG s_getMaxNetworkAdapters(ChipsetType_T aChipset);
     static ULONG s_getMaxNetworkAdaptersOfType(ChipsetType_T aChipset, NetworkAttachmentType_T aType);
+    static HRESULT s_getSupportedVRAMRange(GraphicsControllerType_T aGraphicsControllerType, BOOL fAccelerate3DEnabled, ULONG *aMinMB, ULONG *aMaxMB, ULONG *aStrideSizeMB);
 
 private:

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

@@ -822 +822 @@
 }
 
-HRESULT PlatformProperties::getSupportedVRAMRange(GraphicsControllerType_T aGraphicsControllerType, BOOL fAccelerate3DEnabled,
-                                                  ULONG *aMinMB, ULONG *aMaxMB, ULONG *aStrideSizeMB)
+/**
+ * Returns the [minimum, maximum] VRAM range and stride size for a given graphics controller.
+ *
+ * @returns HRESULT
+ * @param   aGraphicsControllerType Graphics controller type to return values for.
+ * @param   fAccelerate3DEnabled    whether 3D acceleration is enabled / disabled for the selected graphics controller.
+ * @param   aMinMB                  Where to return the minimum VRAM (in MB).
+ * @param   aMaxMB                  Where to return the maximum VRAM (in MB).
+ * @param   aStrideSizeMB           Where to return stride size (in MB). Optional, can be NULL.
+ */
+/* static */
+HRESULT PlatformProperties::s_getSupportedVRAMRange(GraphicsControllerType_T aGraphicsControllerType, BOOL fAccelerate3DEnabled,
+                                                    ULONG *aMinMB, ULONG *aMaxMB, ULONG *aStrideSizeMB)
 {
 #if !defined(VBOX_WITH_VMSVGA) || !defined(VBOX_WITH_VMSVGA3D)
@@ -860 +871 @@
             cbMax = SVGA_VRAM_MAX_SIZE;
 #else
-            return setError(VBOX_E_NOT_SUPPORTED, tr("Support for SVGA not available in this version"));
+            return VBOX_E_NOT_SUPPORTED;
 #endif
             break;
@@ -874 +885 @@
 
         default:
-            return setError(E_INVALIDARG, tr("The graphics controller type (%d) is invalid"), aGraphicsControllerType);
-    }
-
-    *aMinMB        = (ULONG)(RT_ALIGN_64(cbMin, cbStride) / _1M);
-    *aMaxMB        = (ULONG)(RT_ALIGN_64(cbMax, cbStride) / _1M);
-    *aStrideSizeMB = (ULONG)cbStride / _1M;
+            return E_INVALIDARG;
+    }
+
+    /* Convert bytes -> MB, align to stride. */
+    cbMin    = (ULONG)(RT_ALIGN_64(cbMin, cbStride) / _1M);
+    cbMax    = (ULONG)(RT_ALIGN_64(cbMax, cbStride) / _1M);
+    cbStride = (ULONG)cbStride / _1M;
 
 #define MAKE_POWER_OF_TWO(a_MB) \
@@ -885 +897 @@
         a_MB = a_MB + 1; \
 
-    MAKE_POWER_OF_TWO(*aMinMB);
-    MAKE_POWER_OF_TWO(*aMaxMB);
-    MAKE_POWER_OF_TWO(*aStrideSizeMB);
+    MAKE_POWER_OF_TWO(cbMin);
+    MAKE_POWER_OF_TWO(cbMax);
+    MAKE_POWER_OF_TWO(cbStride);
 
 #undef MAKE_POWER_OF_TWO
+
+    /* Finally, clamp the values to our schema definitions before returning. */
+    cbMin = RT_CLAMP(cbMin, (size_t)SchemaDefs::MinGuestVRAM, (size_t)SchemaDefs::MaxGuestVRAM);
+    cbMax = RT_CLAMP(cbMax, (size_t)SchemaDefs::MinGuestVRAM, (size_t)SchemaDefs::MaxGuestVRAM);
+
+    *aMinMB = (ULONG)cbMin;
+    *aMaxMB = (ULONG)cbMax;
+    if (aStrideSizeMB)
+        *aStrideSizeMB = (ULONG)cbStride;
+
+    return S_OK;
+}
+
+HRESULT PlatformProperties::getSupportedVRAMRange(GraphicsControllerType_T aGraphicsControllerType, BOOL fAccelerate3DEnabled,
+                                                  ULONG *aMinMB, ULONG *aMaxMB, ULONG *aStrideSizeMB)
+{
+    HRESULT hrc = PlatformProperties::s_getSupportedVRAMRange(aGraphicsControllerType, fAccelerate3DEnabled, aMinMB, aMaxMB,
+                                                              aStrideSizeMB);
+    switch (hrc)
+    {
+        case VBOX_E_NOT_SUPPORTED:
+            return setError(VBOX_E_NOT_SUPPORTED, tr("Selected graphics controller not supported in this version"));
+
+        case E_INVALIDARG:
+            return setError(E_INVALIDARG, tr("The graphics controller type (%d) is invalid"), aGraphicsControllerType);
+
+        default:
+            break;
+    }
 
     return S_OK;

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

@@ -229 +229 @@
 HRESULT GraphicsAdapter::setVRAMSize(ULONG aVRAMSize)
 {
-    /* check VRAM limits */
-    if (aVRAMSize > SchemaDefs::MaxGuestVRAM)
-        return setError(E_INVALIDARG,
-                        tr("Invalid VRAM size: %lu MB (must be in range [%lu, %lu] MB)"),
-                        aVRAMSize, SchemaDefs::MinGuestVRAM, SchemaDefs::MaxGuestVRAM);
-
     /* the machine needs to be mutable */
     AutoMutableStateDependency adep(mParent);
     if (FAILED(adep.hrc())) return adep.hrc();
+
+    ULONG uMin, uMax;
+    HRESULT hrc = PlatformProperties::s_getSupportedVRAMRange(mData->graphicsControllerType, mData->fAccelerate3D,
+                                                              &uMin, &uMax, NULL /* aStrideSizeMB */);
+    if (FAILED(hrc))
+        return setError(hrc,
+                        tr("Error getting VRAM range for selected graphics controller"));
+
+    /* check VRAM limits */
+    if (   aVRAMSize < uMin
+        || aVRAMSize > uMax)
+        return setError(E_INVALIDARG,
+                        tr("Invalid VRAM size: %lu MB (must be in range [%lu, %lu] MB)"),
+                        aVRAMSize, uMin, uMax);
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);