儲存庫 vbox 的更動 104780

時間撮記:

2024-5-24 下午02:15:44 (6 月 以前)

作者:

vboxsync

訊息:

Main: Added new API IPlatformProperties::getSupportedVRAMRange() to return the VRAM range of a given graphics controller. bugref:​10693

位置:

trunk/src/VBox/Main

檔案:

• Makefile.kmk (修改) (3 筆差異)
• idl/VirtualBox.xidl (修改) (2 筆差異)
• include/PlatformPropertiesImpl.h (修改) (1 筆差異)
• src-all/PlatformPropertiesImpl.cpp (修改) (2 筆差異)
• testcase/tstAPI.cpp (修改) (1 筆差異)

trunk/src/VBox/Main/Makefile.kmk

@@ -212 +212 @@
 VBOX_MAIN_DEFS += VBOX_WITH_NEW_SYS_V_KEYGEN
 
+# Main graphics include paths. Used by VBoxC and VBoxSVC.
+VBOX_MAIN_GRAPHICS_INCS = \
+        $(PATH_ROOT)/src/VBox/Devices/Graphics/ \
+        $(if $(VBOX_WITH_VMSVGA),$(PATH_ROOT)/src/VBox/Devices/Graphics/vmsvga_include,) \
+        $(VBOX_GRAPHICS_INCS)
 
 VBOX_IDL_FILE.MSCOM    = $(VBOX_PATH_SDK)/bindings/mscom/idl/VirtualBox.idl
@@ -568 +573 @@
         $(dir $(VBOX_XML_SCHEMADEFS_H)) \
         $(VBOX_MAIN_APIWRAPPER_INCS) \
+        $(VBOX_MAIN_GRAPHICS_INCS) \
         . \
-        $(VBOX_GRAPHICS_INCS)
  VBoxSVC_INCS.win = \
         $(VBoxCOM_0_OUTDIR)
@@ -1069 +1074 @@
         $(dir $(VBOX_XML_SCHEMADEFS_H)) \
         $(VBOX_MAIN_APIWRAPPER_DIR)/dtrace \
-        $(VBOX_GRAPHICS_INCS)
+        $(VBOX_MAIN_GRAPHICS_INCS)
  VBoxC_INCS.win     = \
         $(VBoxCOM_0_OUTDIR) \

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -12824 +12824 @@
     name="IPlatformProperties"
     extends="$unknown"
-    uuid="45def725-ab32-4a0a-a85e-fae56249d547"
+    uuid="a23502e4-cc54-490f-a344-c8ca8813f906"
     wsmap="managed"
     rest="managed"
@@ -13081 +13081 @@
       <param name="maxInstances" type="unsigned long" dir="return">
         <desc>The maximum number of instances for the given storage bus.</desc>
+      </param>
+    </method>
+
+    <method name="getSupportedVRAMRange">
+      <desc>
+        Returns the VRAM range of a given graphics controller.
+      </desc>
+
+      <param name="graphicsControllerType" type="GraphicsControllerType" dir="in">
+        <desc>Graphics controller type to return VRAM range for.</desc>
+      </param>
+
+      <param name="accelerate3DEnabled" type="boolean" dir="in">
+        <desc>Whether 3D acceleration for the graphics controller type is enabled or not.
+          Ignored if the given graphics controller does not support 3D acceleration.</desc>
+      </param>
+
+      <param name="minMB" type="unsigned long" dir="out">
+        <desc>The minimum size (in MB) the graphics controller supports.</desc>
+      </param>
+
+      <param name="maxMB" type="unsigned long" dir="out">
+        <desc>The maximum size (in MB) the graphics controller supports.</desc>
+      </param>
+
+      <param name="strideSizeMB" type="unsigned long" dir="return">
+        <desc>The stride size the graphics controller supports. This marks the allowed steps between the values
+          when increasing / decreasing the VRAM size.</desc>
       </param>
     </method>

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

@@ -108 +108 @@
                                         StorageBus_T aBus,
                                         ULONG *aMaxInstances) RT_OVERRIDE;
+    HRESULT getSupportedVRAMRange(GraphicsControllerType_T aGraphicsControllerType, BOOL fAccelerate3DEnabled,
+                                  ULONG *aMinMB, ULONG *aMaxMB, ULONG *aStrideSizeMB) RT_OVERRIDE;
     HRESULT getDeviceTypesForStorageBus(StorageBus_T aBus,
                                         std::vector<DeviceType_T> &aDeviceTypes) RT_OVERRIDE;

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

@@ -32 +32 @@
 #include "Global.h"
 
+#include "VBox/vmm/pdmcritsect.h"            /* required by DevVGA.h */
+#include "VBox/param.h"                      /* Ditto. */
+#include "DevVGA.h"
+
 #include <iprt/cpp/utils.h>
 
@@ -821 +825 @@
 }
 
+HRESULT PlatformProperties::getSupportedVRAMRange(GraphicsControllerType_T aGraphicsControllerType, BOOL fAccelerate3DEnabled,
+                                                  ULONG *aMinMB, ULONG *aMaxMB, ULONG *aStrideSizeMB)
+{
+#if !defined(VBOX_WITH_VMSVGA) || !defined(VBOX_WITH_VMSVGA3D)
+    RT_NOREF(fAccelerate3DEnabled);
+#endif
+
+    size_t cbMin;
+    size_t cbMax;
+    size_t cbStride = _1M; /* Default stride for all controllers. */
+
+    switch (aGraphicsControllerType)
+    {
+        case GraphicsControllerType::VBoxVGA:
+        {
+            cbMin = VGA_VRAM_MIN;
+            cbMax = VGA_VRAM_MAX;
+            break;
+        }
+
+        case GraphicsControllerType::VMSVGA:
+        {
+            cbMin = VGA_VRAM_MIN;
+            cbMax = VGA_VRAM_MAX;
+            break;
+        }
+
+        case GraphicsControllerType::VBoxSVGA:
+        {
+#ifdef VBOX_WITH_VMSVGA
+# ifdef VBOX_WITH_VMSVGA3D
+            if (fAccelerate3DEnabled)
+                cbMin = SVGA_VRAM_MIN_SIZE_3D;
+            else
+# endif /* VBOX_WITH_VMSVGA3D */
+                cbMin = SVGA_VRAM_MIN_SIZE;
+            cbMax = SVGA_VRAM_MAX_SIZE;
+#else
+            return setError(VBOX_E_NOT_SUPPORTED, tr("Support for SVGA not available in this version"));
+#endif
+            break;
+        }
+
+        case GraphicsControllerType::QemuRamFB:
+        {
+            /* We seem to hardcode 32-bit (4 bytes) as BPP, see RAMFB_BPP in QemuRamfb.c. */
+            cbMin = 4 /* BPP in bytes */ * 16    * 16;    /* Values taken from qemu/hw/display/ramfb.c */
+            cbMax = 4 /* BPP in bytes */ * 16000 * 12000; /* Values taken from bochs-vbe.h. */
+            break;
+        }
+
+        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;
+
+#define MAKE_POWER_OF_TWO(a_MB) \
+    while (!RT_IS_POWER_OF_TWO(a_MB)) \
+        a_MB = a_MB + 1; \
+
+    MAKE_POWER_OF_TWO(*aMinMB);
+    MAKE_POWER_OF_TWO(*aMaxMB);
+    MAKE_POWER_OF_TWO(*aStrideSizeMB);
+
+#undef MAKE_POWER_OF_TWO
+
+    return S_OK;
+}
+
 HRESULT PlatformProperties::getSupportedAudioControllerTypes(std::vector<AudioControllerType_T> &aSupportedAudioControllerTypes)
 {

trunk/src/VBox/Main/testcase/tstAPI.cpp

@@ -1148 +1148 @@
     RTPrintf("\n");
 #endif
+
+    do {
+        PlatformArchitecture_T platformArch = PlatformArchitecture_x86;
+        ComPtr<IPlatformProperties> platformProperties;
+        CHECK_ERROR_BREAK(virtualBox, GetPlatformProperties(platformArch, platformProperties.asOutParam()));
+        ULONG uMinMB, uMaxMB, uStrideMB;
+        CHECK_ERROR_BREAK(platformProperties, GetSupportedVRAMRange(GraphicsControllerType_VBoxVGA, TRUE /* fAccelerate3DEnabled */, &uMinMB, &uMaxMB, &uStrideMB));
+        ASSERT_BREAK(uMinMB && RT_IS_POWER_OF_TWO(uMinMB));
+        ASSERT_BREAK(uMaxMB && RT_IS_POWER_OF_TWO(uMaxMB));
+        ASSERT_BREAK(uStrideMB && RT_IS_POWER_OF_TWO(uStrideMB));
+    } while (0);
 
 #if 1