Changeset 65381 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jan 20, 2017 9:23:53 AM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

112977

Message:

bugref:8282: Additions/linux: submit DRM driver to the Linux kernel: move all graphics device-related header files to a separate sub-directory and add that to the include path where they are needed. The intention is too be able to remove the VBox/ include folder in the DRM driver package.

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxVideo/HGSMIBase.cpp (modified) (1 diff)
• VBoxVideo/Modesetting.cpp (modified) (1 diff)
• VBoxVideo/VBVABase.cpp (modified) (1 diff)
• crOpenGL/Makefile.kmk (modified) (5 diffs)
• crOpenGL/icd_drv.c (modified) (1 diff)
• crOpenGL/load.c (modified) (1 diff)
• crOpenGL/pack/packspu_init.c (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp

@@ -17 +17 @@
  */
 
-#include <VBox/VBoxVideoGuest.h>
-#include <VBox/VBoxVideo.h>
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBoxVideoGuest.h>
+#include <VBoxVideoVBE.h>
 
 #include <iprt/asm.h>

trunk/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp

@@ -17 +17 @@
  */
 
-#include <VBox/VBoxVideoGuest.h>
-#include <VBox/VBoxVideo.h>
-#include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBoxVideoGuest.h>
+#include <VBoxVideoVBE.h>
 
 #ifndef VBOX_GUESTR3XF86MOD

trunk/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp

@@ -17 +17 @@
  */
 
-#include <VBox/VBoxVideoGuest.h>
-#include <VBox/VBoxVideo.h>
+#include <VBoxVideoGuest.h>
 #include <VBox/err.h>
 // #include <VBox/log.h>

trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

@@ -66 +66 @@
 #
 VBoxOGL_TEMPLATE       = VBOXCROGLR3GUESTDLL
-VBoxOGL_INCS           = .
+VBoxOGL_INCS           = . $(VBOX_GRAPHICS_INCS)
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
  ifndef VBOX_USE_SYSTEM_GL_HEADERS
@@ -448 +448 @@
 VBoxOGLarrayspu_TEMPLATE      = VBOXCROGLR3GUESTDLL
 VBoxOGLarrayspu_INCS          = \
-        array
+        array \
+        $(VBOX_GRAPHICS_INCS)
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
  VBoxOGLarrayspu_INCS += \
@@ -496 +497 @@
 VBoxOGLpassthroughspu_TEMPLATE    = VBOXCROGLR3GUESTDLL
 VBoxOGLpassthroughspu_INCS        = \
-        passthrough
+        passthrough \
+        $(VBOX_GRAPHICS_INCS)
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
  VBoxOGLpassthroughspu_INCS += \
@@ -545 +547 @@
 VBoxOGLpackspu_DEFS          = TRACKS_STATE=1 PACKS=1
 VBoxOGLpackspu_INCS          = \
-        pack
+        pack \
+        $(VBOX_GRAPHICS_INCS)
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
  VBoxOGLpackspu_INCS += \
@@ -651 +654 @@
 VBoxOGLfeedbackspu_TEMPLATE    = VBOXCROGLR3GUESTDLL
 VBoxOGLfeedbackspu_INCS        = \
-        feedback
+        feedback \
+        $(VBOX_GRAPHICS_INCS)
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
  VBoxOGLfeedbackspu_INCS += \

trunk/src/VBox/Additions/common/crOpenGL/icd_drv.c

@@ -23 +23 @@
 
 #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
-# include <VBox/VBoxCrHgsmi.h>
-# include <VBox/VBoxUhgsmi.h>
+# include <VBoxCrHgsmi.h>
+# include <VBoxUhgsmi.h>
 #endif
 

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -35 +35 @@
 
 #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
-# include <VBox/VBoxCrHgsmi.h>
+# include <VBoxCrHgsmi.h>
 #endif
 

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_init.c

@@ -28 +28 @@
 
 #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
-# include <VBox/VBoxCrHgsmi.h>
-# include <VBox/VBoxUhgsmi.h>
+# include <VBoxCrHgsmi.h>
+# include <VBoxUhgsmi.h>
 #endif