Changeset 69061 in vbox for trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

Timestamp:

Oct 12, 2017 2:07:17 PM (7 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: add our own, trival device memory allocator.
bugref:9017: Additions/x11: put vboxvideo into upstream X.Org

We currently pull the full-blown generic device memory allocator into the
X.Org vboxvideo driver, which in turn pulls in various IPRT dependencies.
This is not really necessary, as we only ever have one allocated buffer and
run single threaded. So this change makes us use a trivial allocator which
just returns a pointer to the beginning of the device memory area and fails
if there is already an allocation which has not yet been freed.

File:

• trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk (modified) (5 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

@@ -39 +39 @@
         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
         $(VBOX_GRAPHICS_INCS)
+vboxvideo_override_INCLUDES = \
+    -include $(PATH_ROOT)/src/VBox/Additions/x11/vboxvideo/HGSMIMemAlloc.h
 
 vboxvideo.c_DEPS = $(VBOX_SVN_REV_HEADER)
@@ -48 +50 @@
 #
 vboxvideo_drv_lib_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxvideo_drv_lib_CFLAGS += $(vboxvideo_override_INCLUDES)
+vboxvideo_drv_lib_CXXFLAGS += $(vboxvideo_override_INCLUDES)
 ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.  Do we need this?  I don't want to find out.
  vboxvideo_drv_lib_CFLAGS += -D_XPG6 -Wno-shadow # Use XPG6 until we have moved the C++ bits into a library.
@@ -57 +61 @@
         $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/HGSMI/HGSMIMemAlloc.cpp
+        $(PATH_ROOT)/src/VBox/Additions/x11/vboxvideo/hgsmimemalloc.c
 vboxvideo_drv_lib_INCS = \
         $(PATH_ROOT)/src/VBox/Runtime/include \
@@ -70 +74 @@
 endif   # target linux
 vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
+vboxvideo_drv_CFLAGS += $(vboxvideo_override_INCLUDES)
 vboxvideo_drv_CFLAGS += -Wno-shadow # Avoid MBs of warnings in X11 and OpenGL headers (solaris mostly).
+vboxvideo_drv_CXXFLAGS += $(vboxvideo_override_INCLUDES)
 vboxvideo_drv_DEFS.linux = linux
 vboxvideo_drv_DEFS.x86 = __i386__
@@ -144 +150 @@
 vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_70_DEFS = $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=70000000
+vboxvideo_drv_70_CFLAGS += $(vboxvideo_override_INCLUDES)
 ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
  vboxvideo_drv_70_CFLAGS += -D_XPG6 -Wno-shadow # Use XPG6 until we have moved the C++ bits into a library.