WINNT

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/WINNT

Files:

: 25 edited

Graphics/Video/common/wddm/VBoxMPIf.h (modified) (1 diff)
Graphics/Video/common/xpdm/VBoxVideoIOCTL.h (modified) (1 diff)
Graphics/Video/disp/Makefile.kmk (modified) (4 diffs)
Graphics/Video/disp/wddm/VBoxCrHgsmi.cpp (modified) (1 diff)
Graphics/Video/disp/wddm/VBoxDispD3D.cpp (modified) (1 diff)
Graphics/Video/disp/wddm/VBoxUhgsmiBase.h (modified) (1 diff)
Graphics/Video/disp/xpdm/VBoxDispInternal.h (modified) (1 diff)
Graphics/Video/disp/xpdm/VBoxDispVBVA.cpp (modified) (1 diff)
Graphics/Video/mp/Makefile.kmk (modified) (2 diffs)
Graphics/Video/mp/common/VBoxMPCommon.cpp (modified) (1 diff)
Graphics/Video/mp/common/VBoxMPDevExt.h (modified) (1 diff)
Graphics/Video/mp/common/VBoxMPVidModes.cpp (modified) (1 diff)
Graphics/Video/mp/wddm/VBoxMPMisc.cpp (modified) (1 diff)
Graphics/Video/mp/wddm/VBoxMPShgsmi.h (modified) (1 diff)
Graphics/Video/mp/wddm/VBoxMPVdma.h (modified) (1 diff)
Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (1 diff)
Graphics/Video/mp/xpdm/VBoxMPDriver.cpp (modified) (1 diff)
Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp (modified) (1 diff)
Graphics/Video/mp/xpdm/VBoxMPInternal.cpp (modified) (1 diff)
Graphics/Wine_new/Makefile.kmk (modified) (1 diff)
Graphics/Wine_new/wined3d/directx.c (modified) (1 diff)
Graphics/Wine_new/wined3d/vboxext.c (modified) (1 diff)
Graphics/Wine_new/wined3d/wined3d_private.h (modified) (1 diff)
VBoxTray/Makefile.kmk (modified) (1 diff)
include/VBoxDisplay.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/src/VBox/Additions/WINNT/Graphics/Video/common/wddm/VBoxMPIf.h

-              r63018
+              r65381
 #define ___VBoxMPIf_h___
 #include <VBox/VBoxVideo.h>
+#include <VBoxVideo.h>
 #include "../../../../include/VBoxDisplay.h"
 #include "../VBoxVideoTools.h"
 #include <VBox/VBoxUhgsmi.h>
+#include <VBoxUhgsmi.h>
 #include <VBox/VBoxGuest2.h>

trunk/src/VBox/Additions/WINNT/Graphics/Video/common/xpdm/VBoxVideoIOCTL.h

r62522	r65381
21	21
22	22	#include <VBox/VMMDev.h>
23		#include <~~VBox/HGSMI/~~HGSMI.h>
	23	#include <HGSMI.h>
24	24
25	25	/* ==================== Virtual Box specific VRP's ==================== */

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk

-              r63107
+              r65381
 endif
 #VBoxDisp_DEFS         += VBOX_VBVA_ADJUST_RECT
 VBoxDisp_INCS          = ../../../include ..
+VBoxDisp_INCS          = ../../../include .. $(VBOX_GRAPHICS_INCS)
 VBoxDisp_LDFLAGS.x86   = /Entry:DrvEnableDriver@12
 VBoxDisp_LDFLAGS.amd64 = /Entry:DrvEnableDriver
 …
         ../../../include \
         .. \
+        $(VBOX_PATH_CROGL_INCLUDE)
+        $(VBOX_PATH_CROGL_INCLUDE) \
+        $(VBOX_GRAPHICS_INCS)
 VBoxDispD3D_SOURCES  = \
         wddm/VBoxDispD3D.cpp \
 …
 #use same defines as VBoxDispD3D to ensure structure definitions match
 VBoxCrHgsmi_DEFS        = $(subst VBOXWDDMDISP,IN_VBOXCRHGSMI,$(VBoxDispD3D_DEFS))
+VBoxCrHgsmi_INCS        = ../../../include .. $(VBOX_PATH_CROGL_INCLUDE)
+VBoxCrHgsmi_INCS        = \
+        ../../../include \
+        .. \
+        $(VBOX_PATH_CROGL_INCLUDE) \
+        $(VBOX_GRAPHICS_INCS)
 VBoxCrHgsmi_SOURCES     = \
         wddm/VBoxCrHgsmi.cpp \
 …
 VBoxDispMpLogger_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
 VBoxDispMpLogger_DEFS        = UNICODE _UNICODE VBOX_WITH_CRHGSMI IN_VBOXCRHGSMI VBOX_WITH_WDDM VBOX_WITH_VDMA VBOX_WITH_HGCM
 VBoxDispMpLogger_INCS        = ../../../include ..
+VBoxDispMpLogger_INCS        = ../../../include .. $(VBOX_GRAPHICS_INCS)
 VBoxDispMpLogger_SOURCES     = \
     wddm/VBoxDispMpLogger.cpp

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxCrHgsmi.cpp

r62856	r65381
17	17	*/
18	18
19		#include <VBox~~/VBox~~CrHgsmi.h>
	19	#include <VBoxCrHgsmi.h>
20	20	#include <iprt/err.h>
21	21

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp

r64766	r65381
28	28	#include "VBoxDispD3DCmn.h"
29	29	#include "VBoxDispD3D.h"
30		#include <VBox~~/VBox~~CrHgsmi.h>
	30	#include <VBoxCrHgsmi.h>
31	31
32	32	#include <Psapi.h>

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiBase.h

-              r63018
+              r65381
 #define ___VBoxUhgsmiBase_h__
 #include <VBox/VBoxUhgsmi.h>
 #include <VBox/VBoxCrHgsmi.h>
+#include <VBoxUhgsmi.h>
+#include <VBoxCrHgsmi.h>
 #include <iprt/win/windows.h>

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispInternal.h

-              r63033
+              r65381
 #include "common/xpdm/VBoxVideoPortAPI.h"
 #include "common/xpdm/VBoxVideoIOCTL.h"
 #include <VBox/HGSMI/HGSMI.h>
 #include <VBox/VBoxVideo.h>
 #include <VBox/VBoxVideoGuest.h>
+#include <HGSMI.h>
+#include <VBoxVideo.h>
+#include <VBoxVideoGuest.h>
 #include <VBoxDisplay.h>

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/xpdm/VBoxDispVBVA.cpp

r63060	r65381
18	18	#include "VBoxDisp.h"
19	19	#include "VBoxDispMini.h"
20		#include <~~VBox/HGSMI/~~HGSMIChSetup.h>
	20	#include <HGSMIChSetup.h>
21	21
22	22	#ifdef VBOX_VBVA_ADJUST_RECT

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk

-              r62522
+              r65381
  VBoxVideo_DEFS        += VBOX_WITH_VIDEOHWACCEL
 endif
 VBoxVideo_INCS          = ../../../include .. .
+VBoxVideo_INCS          = ../../../include .. . $(VBOX_GRAPHICS_INCS)
 VBoxVideo_LDFLAGS.x86   = /Entry:DriverEntry@8
 VBoxVideo_LDFLAGS.amd64 = /Entry:DriverEntry
 …
         $(VBOX_PATH_CROGL_INCLUDE) \
         $(VBOX_PATH_CROGL_GENFILES) \
+        $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer
+        $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer \
+        $(VBOX_GRAPHICS_INCS)
  VBoxVideoWddm_LDFLAGS.x86 += /Entry:DriverEntry@8

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPCommon.cpp

r65193	r65381
18	18
19	19	#include "VBoxMPCommon.h"
20		#include <VBox~~/Hardware/VBox~~VideoVBE.h>
	20	#include <VBoxVideoVBE.h>
21	21
22	22	int VBoxMPCmnMapAdapterMemory(PVBOXMP_COMMON pCommon, void **ppv, uint32_t ulOffset, uint32_t ulSize)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPDevExt.h

r63823	r65381
20	20
21	21	#include "VBoxMPUtils.h"
22		#include <VBox~~/VBox~~VideoGuest.h>
	22	#include <VBoxVideoGuest.h>
23	23
24	24	#ifdef VBOX_XPDM_MINIPORT

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPVidModes.cpp

r65193	r65381
23	23	#endif
24	24	#include <wchar.h>
25		#include <VBox~~/Hardware/VBox~~VideoVBE.h>
	25	#include <VBoxVideoVBE.h>
26	26
27	27	#ifdef VBOX_WITH_WDDM

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPMisc.cpp

r65193	r65381
17	17
18	18	#include "VBoxMPWddm.h"
19		#include <VBox~~/Hardware/VBox~~VideoVBE.h>
	19	#include <VBoxVideoVBE.h>
20	20	#include <stdio.h>
21	21

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPShgsmi.h

r62522	r65381
21	21
22	22	#include <iprt/cdefs.h>
23		#include <VBox~~/VBox~~Video.h>
	23	#include <VBoxVideo.h>
24	24
25	25	#include "common/VBoxMPUtils.h"

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVdma.h

-              r62522
+              r65381
 #include <iprt/cdefs.h>
 #include <iprt/asm.h>
 #include <VBox/VBoxVideo.h>
 #include <VBox/HGSMI/HGSMI.h>
+#include <VBoxVideo.h>
+#include <HGSMI.h>
 typedef struct _VBOXMP_DEVEXT *PVBOXMP_DEVEXT;

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

-              r65193
+              r65381
 #include <VBox/VBoxGuestLib.h>
 #include <VBox/VBoxVideo.h>
+#include <VBoxVideo.h>
 #include <wingdi.h> /* needed for RGNDATA definition */
 #include <VBoxDisplay.h> /* this is from Additions/WINNT/include/ to include escape codes */
 #include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBoxVideoVBE.h>
 #include <VBox/Version.h>

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp

-              r65193
+              r65381
 *********************************************************************************************************************************/
 #include "VBoxMPInternal.h"
 #include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBoxVideoVBE.h>
 #include <VBox/VBoxGuestLib.h>
 #include <VBox/VBoxVideo.h>
+#include <VBoxVideo.h>
 #include "common/VBoxMPHGSMI.h"
 #include "common/VBoxMPCommon.h"

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp

-              r65193
+              r65381
 #include "VBoxMPInternal.h"
 #include "common/VBoxMPCommon.h"
 #include <VBox/Hardware/VBoxVideoVBE.h>
+#include <VBoxVideoVBE.h>
 #include <VBox/VBoxGuestLib.h>
 #include <VBox/VBoxVideo.h>
+#include <VBoxVideo.h>
 /* Note: in/out parameters passed to VBoxDrvStartIO point to the same memory location.

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPInternal.cpp

r63566	r65381
17	17
18	18	#include "VBoxMPInternal.h"
19		#include <VBox~~/VBox~~Video.h>
	19	#include <VBoxVideo.h>
20	20	#include <VBox/VBoxGuestLib.h>
21	21	#include <iprt/asm.h>

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk

-              r63107
+              r65381
 #wined3d_DEFS        += VBOX_WITH_WINE_FIXES
 wined3d_INCS        := \
+        vbox/libWineStub/include
+        vbox/libWineStub/include \
+        $(VBOX_GRAPHICS_INCS)
 wined3d_SOURCES     := \
         wined3d/arb_program_shader.c \

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/directx.c

r63025	r65381
39	39	#include "winternl.h"
40	40	#ifdef VBOX_WITH_WDDM
41		#include <VBox~~/VBox~~CrHgsmi.h>
	41	#include <VBoxCrHgsmi.h>
42	42	#endif
43	43

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/vboxext.c

r63025	r65381
19	19	#include "vboxext.h"
20	20	#ifdef VBOX_WITH_WDDM
21		#include <VBox~~/VBox~~CrHgsmi.h>
	21	#include <VBoxCrHgsmi.h>
22	22	#include <iprt/err.h>
23	23	#endif

trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/wined3d/wined3d_private.h

r63020	r65381
83	83	# define VBoxTlsRefSetImpl(_tls, _val) (TlsSetValue((DWORD)(_tls), (_val)))
84	84	# define VBoxTlsRefAssertImpl Assert
85		# include <VBox~~/VBox~~Video3D.h>
	85	# include <VBoxVideo3D.h>
86	86	#endif
87	87

trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

r63107	r65381
29	29	VBOX_WITH_HGCM \
30	30	VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
31		VBoxTray_INCS = ../include
	31	VBoxTray_INCS = ../include $(VBOX_GRAPHICS_INCS)
32	32	VBoxTray_SOURCES = \
33	33	VBoxTray.cpp \

trunk/src/VBox/Additions/WINNT/include/VBoxDisplay.h

r65193	r65381
84	84
85	85	/* for VBOX_VIDEO_MAX_SCREENS definition */
86		#include <VBox~~/Hardware/VBoxVideoVBE~~.h>
	86	#include <VBoxVideo.h>
87	87
88	88	typedef struct VBOXWDDM_RECOMMENDVIDPN_SOURCE

Note: See TracChangeset for help on using the changeset viewer.

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

Legend:

Download in other formats: