Changeset 104786 in vbox for trunk/src/VBox

Timestamp:

May 27, 2024 8:42:44 AM (6 months ago)

Author:

vboxsync

Message:

Main: Added a new include VBox/graphics.h to avoid dragging in a lot of other includes not needed in Main. bugref:​10693

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA.h (modified) (2 diffs)
• Devices/Graphics/vmsvga_include/svga_reg.h (modified) (2 diffs)
• Main/Makefile.kmk (modified) (3 diffs)
• Main/src-all/PlatformPropertiesImpl.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -72 +72 @@
 #endif
 
+#include <VBox/graphics.h> /* For VRAM ranges. */
+
 #include <iprt/list.h>
 
@@ -77 +79 @@
 /** Use VBE bytewise I/O. Only needed for Windows Longhorn/Vista betas and backwards compatibility. */
 #define VBE_BYTEWISE_IO
-
-#ifdef VBOX
-/** The default amount of VRAM. */
-# define VGA_VRAM_DEFAULT    (_4M)
-/** The maximum amount of VRAM. Limited by VBOX_MAX_ALLOC_PAGE_COUNT. */
-# define VGA_VRAM_MAX        (256 * _1M)
-/** The minimum amount of VRAM. */
-# define VGA_VRAM_MIN        (_1M)
-#endif
-
 
 /** @name Macros dealing with partial ring-0/raw-mode VRAM mappings.

trunk/src/VBox/Devices/Graphics/vmsvga_include/svga_reg.h

@@ -41 +41 @@
 
 #include "svga_types.h"
+
+#include <VBox/graphics.h> /* For VRAM ranges. */
 
 /*
@@ -2268 +2270 @@
  * Size of SVGA device memory such as frame buffer and FIFO.
  */
-#define SVGA_VRAM_MIN_SIZE             (4 * 640 * 480) /* bytes */
-#define SVGA_VRAM_MIN_SIZE_3D       (16 * 1024 * 1024)
-#define SVGA_VRAM_MAX_SIZE         (128 * 1024 * 1024)
 #define SVGA_MEMORY_SIZE_MAX      (1024 * 1024 * 1024)
 #define SVGA_FIFO_SIZE_MAX           (2 * 1024 * 1024)

trunk/src/VBox/Main/Makefile.kmk

@@ -211 +211 @@
 # Unconditionally enable the new semaphore key generation code
 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
@@ -573 +567 @@
         $(dir $(VBOX_XML_SCHEMADEFS_H)) \
         $(VBOX_MAIN_APIWRAPPER_INCS) \
-        $(VBOX_MAIN_GRAPHICS_INCS) \
         . \
+        $(VBOX_GRAPHICS_INCS)
         VBoxSVC_INCS.win = \
         $(VBoxCOM_0_OUTDIR)
@@ -1082 +1076 @@
         $(dir $(VBOX_XML_SCHEMADEFS_H)) \
         $(VBOX_MAIN_APIWRAPPER_DIR)/dtrace \
-        $(VBOX_MAIN_GRAPHICS_INCS)
+        $(VBOX_GRAPHICS_INCS)
  VBoxC_INCS.win     = \
         $(VBoxCOM_0_OUTDIR) \

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>
 
+#include <VBox/graphics.h> /* For VRAM ranges. */
 #include <VBox/settings.h>