VirtualBox

Changeset 65381 in vbox


Ignore:
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
Files:
1 deleted
99 edited
1 copied
7 moved

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/include/VBox/Graphics/HGSMI.h

    r62476 r65381  
    2727
    2828
    29 #ifndef ___VBox_HGSMI_HGSMI_h
    30 #define ___VBox_HGSMI_HGSMI_h
     29#ifndef ___VBox_Graphics_HGSMI_h
     30#define ___VBox_Graphics_HGSMI_h
    3131
    3232#include <iprt/assert.h>
    3333#include <iprt/types.h>
    3434
    35 #include <VBox/HGSMI/HGSMIDefs.h>
    36 #include <VBox/HGSMI/HGSMIChannels.h>
    37 #include <VBox/HGSMI/HGSMIMemAlloc.h>
     35#include <HGSMIDefs.h>
     36#include <HGSMIChannels.h>
     37#include <HGSMIMemAlloc.h>
    3838
    3939/*
    … …  
    261261RT_C_DECLS_END
    262262
    263 #endif /* !___VBox_HGSMI_HGSMI_h */
    264 
     263#endif /* !___VBox_Graphics_HGSMI_h */
     264

  • TabularUnified trunk/include/VBox/Graphics/HGSMIChSetup.h

    r62932 r65381  
    2424 */
    2525
    26 #ifndef ___VBox_HGSMI_HGSMIChSetup_h
    27 #define ___VBox_HGSMI_HGSMIChSetup_h
     26#ifndef ___VBox_Graphics_HGSMIChSetup_h
     27#define ___VBox_Graphics_HGSMIChSetup_h
    2828
    29 #include <VBox/HGSMI/HGSMI.h>
     29#include <HGSMI.h>
    3030
    3131/* HGSMI setup and configuration channel commands and data structures. */

  • TabularUnified trunk/include/VBox/Graphics/HGSMIDefs.h

    r62476 r65381  
    2727
    2828
    29 #ifndef ___VBox_HGSMI_HGSMIDefs_h
    30 #define ___VBox_HGSMI_HGSMIDefs_h
     29#ifndef ___VBox_Graphics_HGSMIDefs_h
     30#define ___VBox_Graphics_HGSMIDefs_h
    3131
    3232#include <iprt/assert.h>
    … …  
    121121} HGSMIENV;
    122122
    123 #endif /* !___VBox_HGSMI_HGSMIDefs_h */
     123#endif /* !___VBox_Graphics_HGSMIDefs_h */

  • TabularUnified trunk/include/VBox/Graphics/HGSMIMemAlloc.h

    r64650 r65381  
    2727
    2828
    29 #ifndef ___VBox_HGSMI_HGSMIMemAlloc_h
    30 #define ___VBox_HGSMI_HGSMIMemAlloc_h
     29#ifndef ___VBox_Graphics_HGSMIMemAlloc_h
     30#define ___VBox_Graphics_HGSMIMemAlloc_h
    3131
    32 #include <VBox/HGSMI/HGSMIDefs.h>
     32#include <HGSMIDefs.h>
    3333#include <iprt/list.h>
    3434
    … …  
    100100RT_C_DECLS_END
    101101
    102 #endif /* !___VBox_HGSMI_HGSMIMemAlloc_h */
     102#endif /* !___VBox_Graphics_HGSMIMemAlloc_h */

  • TabularUnified trunk/include/VBox/Graphics/VBoxCrHgsmi.h

    r65380 r65381  
    2323
    2424#include <iprt/cdefs.h>
    25 #include <VBox/VBoxUhgsmi.h>
     25#include <VBoxUhgsmi.h>
    2626
    2727RT_C_DECLS_BEGIN

  • TabularUnified trunk/include/VBox/Graphics/VBoxVideo.h

    r65380 r65381  
    2424 */
    2525
    26 #ifndef ___VBox_VBoxVideo_h
    27 #define ___VBox_VBoxVideo_h
    28 
    29 #include <VBox/Hardware/VBoxVideoVBE.h>
     26#ifndef ___VBox_Graphics_VBoxVideo_h
     27#define ___VBox_Graphics_VBoxVideo_h
    3028
    3129#include <iprt/cdefs.h>
    3230#include <iprt/types.h>
    3331#include <iprt/assert.h>
     32
     33/* this should be in sync with monitorCount <xsd:maxInclusive value="64"/> in src/VBox/Main/xml/VirtualBox-settings-common.xsd */
     34#define VBOX_VIDEO_MAX_SCREENS 64
    3435
    3536/*

  • TabularUnified trunk/include/VBox/Graphics/VBoxVideo3D.h

    r65380 r65381  
    2424 */
    2525
    26 #ifndef ___VBox_VBoxVideo3D_h
    27 #define ___VBox_VBoxVideo3D_h
     26#ifndef ___VBox_Graphics_VBoxVideo3D_h
     27#define ___VBox_Graphics_VBoxVideo3D_h
    2828
    2929#include <iprt/cdefs.h>
    … …  
    144144
    145145
    146 #endif /* #ifndef ___VBox_VBoxVideo3D_h */
     146#endif /* #ifndef ___VBox_Graphics_VBoxVideo3D_h */

  • TabularUnified trunk/include/VBox/Graphics/VBoxVideoGuest.h

    r65380 r65381  
    2626
    2727
    28 #ifndef ___VBox_VBoxVideoGuest_h___
    29 #define ___VBox_VBoxVideoGuest_h___
    30 
    31 #include <VBox/HGSMI/HGSMI.h>
    32 #include <VBox/HGSMI/HGSMIChSetup.h>
    33 #include <VBox/VBoxVideo.h>
     28#ifndef ___VBox_Graphics_VBoxVideoGuest_h___
     29#define ___VBox_Graphics_VBoxVideoGuest_h___
     30
     31#include <HGSMI.h>
     32#include <HGSMIChSetup.h>
     33#include <VBoxVideo.h>
    3434
    3535#include <iprt/err.h>  /* The functions in here return IPRT errors. */

  • TabularUnified trunk/include/VBox/Graphics/VBoxVideoHost3D.h

    r65380 r65381  
    2424 * terms and conditions of either the GPL or the CDDL or both.
    2525 */
    26 #ifndef ___VBox_VBoxVideoHost3D_h
    27 #define ___VBox_VBoxVideoHost3D_h
     26#ifndef ___VBox_Graphics_VBoxVideoHost3D_h
     27#define ___VBox_Graphics_VBoxVideoHost3D_h
    2828#include <iprt/cdefs.h>
    29 #include <VBox/VBoxVideo.h>
     29#include <VBoxVideo.h>
    3030#include <VBox/hgcmsvc.h>
    3131#include <VBox/vmm/pdmifs.h>
    … …  
    199199#pragma pack()
    200200
    201 #endif /*#ifndef ___VBox_VBoxVideoHost3D_h*/
     201#endif /*#ifndef ___VBox_Graphics_VBoxVideoHost3D_h*/

  • TabularUnified trunk/include/VBox/Graphics/VBoxVideoVBE.h

    r65380 r65381  
    2424 */
    2525
    26 #ifndef ___VBox_Hardware_VBoxVideoVBE_h
    27 #define ___VBox_Hardware_VBoxVideoVBE_h
     26#ifndef ___VBox_Graphics_VBoxVideoVBE_h
     27#define ___VBox_Graphics_VBoxVideoVBE_h
    2828
    2929/* GUEST <-> HOST Communication API */
    … …  
    8181#define VGA_PORT_HGSMI_GUEST            0x3d0
    8282
    83 /* this should be in sync with monitorCount <xsd:maxInclusive value="64"/> in src/VBox/Main/xml/VirtualBox-settings-common.xsd */
    84 #define VBOX_VIDEO_MAX_SCREENS 64
     83#endif /* !___VBox_Graphics_VBoxVideoVBE_h */
    8584
    86 #endif /* !___VBox_Hardware_VBoxVideoVBE_h */
    87 

  • TabularUnified trunk/include/VBox/HostServices/VBoxCrOpenGLSvc.h

    r62476 r65381  
    3232#include <VBox/VBoxGuest2.h>
    3333#include <VBox/hgcmsvc.h>
    34 #include <VBox/VBoxVideo.h>
    35 #include <VBox/VBoxVideoHost3D.h>
     34#include <VBoxVideo.h>
     35#include <VBoxVideoHost3D.h>
    3636
    3737/* crOpenGL host functions */

  • TabularUnified trunk/include/VBox/VMMDev.h

    r64207 r65381  
    348348    /** Header. */
    349349    VMMDevRequestHeader header;
    350     /** VBOX_MOUSE_POINTER_* bit flags from VBox/VBoxVideo.h. */
     350    /** VBOX_MOUSE_POINTER_* bit flags from VBox/Graphics/VBoxVideo.h. */
    351351    uint32_t fFlags;
    352352    /** x coordinate of hot spot. */

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

    r63018 r65381  
    2727#define ___VBoxMPIf_h___
    2828
    29 #include <VBox/VBoxVideo.h>
     29#include <VBoxVideo.h>
    3030#include "../../../../include/VBoxDisplay.h"
    3131#include "../VBoxVideoTools.h"
    32 #include <VBox/VBoxUhgsmi.h>
     32#include <VBoxUhgsmi.h>
    3333#include <VBox/VBoxGuest2.h>
    3434

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

    r62522 r65381  
    2121
    2222#include <VBox/VMMDev.h>
    23 #include <VBox/HGSMI/HGSMI.h>
     23#include <HGSMI.h>
    2424
    2525/* ==================== Virtual Box specific VRP's ==================== */

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

    r63107 r65381  
    3838endif
    3939#VBoxDisp_DEFS         += VBOX_VBVA_ADJUST_RECT
    40 VBoxDisp_INCS          = ../../../include ..
     40VBoxDisp_INCS          = ../../../include .. $(VBOX_GRAPHICS_INCS)
    4141VBoxDisp_LDFLAGS.x86   = /Entry:DrvEnableDriver@12
    4242VBoxDisp_LDFLAGS.amd64 = /Entry:DrvEnableDriver
    … …  
    108108        ../../../include \
    109109        .. \
    110         $(VBOX_PATH_CROGL_INCLUDE)
     110        $(VBOX_PATH_CROGL_INCLUDE) \
     111        $(VBOX_GRAPHICS_INCS)
    111112VBoxDispD3D_SOURCES  = \
    112113        wddm/VBoxDispD3D.cpp \
    … …  
    151152#use same defines as VBoxDispD3D to ensure structure definitions match
    152153VBoxCrHgsmi_DEFS        = $(subst VBOXWDDMDISP,IN_VBOXCRHGSMI,$(VBoxDispD3D_DEFS))
    153 VBoxCrHgsmi_INCS        = ../../../include .. $(VBOX_PATH_CROGL_INCLUDE)
     154VBoxCrHgsmi_INCS        = \
     155        ../../../include \
     156        .. \
     157        $(VBOX_PATH_CROGL_INCLUDE) \
     158        $(VBOX_GRAPHICS_INCS)
    154159VBoxCrHgsmi_SOURCES     = \
    155160        wddm/VBoxCrHgsmi.cpp \
    … …  
    177182VBoxDispMpLogger_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
    178183VBoxDispMpLogger_DEFS        = UNICODE _UNICODE VBOX_WITH_CRHGSMI IN_VBOXCRHGSMI VBOX_WITH_WDDM VBOX_WITH_VDMA VBOX_WITH_HGCM
    179 VBoxDispMpLogger_INCS        = ../../../include ..
     184VBoxDispMpLogger_INCS        = ../../../include .. $(VBOX_GRAPHICS_INCS)
    180185VBoxDispMpLogger_SOURCES     = \
    181186    wddm/VBoxDispMpLogger.cpp

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

    r62856 r65381  
    1717 */
    1818
    19 #include <VBox/VBoxCrHgsmi.h>
     19#include <VBoxCrHgsmi.h>
    2020#include <iprt/err.h>
    2121

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

    r64766 r65381  
    2828#include "VBoxDispD3DCmn.h"
    2929#include "VBoxDispD3D.h"
    30 #include <VBox/VBoxCrHgsmi.h>
     30#include <VBoxCrHgsmi.h>
    3131
    3232#include <Psapi.h>

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

    r63018 r65381  
    1919#define ___VBoxUhgsmiBase_h__
    2020
    21 #include <VBox/VBoxUhgsmi.h>
    22 #include <VBox/VBoxCrHgsmi.h>
     21#include <VBoxUhgsmi.h>
     22#include <VBoxCrHgsmi.h>
    2323
    2424#include <iprt/win/windows.h>

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

    r63033 r65381  
    3535#include "common/xpdm/VBoxVideoPortAPI.h"
    3636#include "common/xpdm/VBoxVideoIOCTL.h"
    37 #include <VBox/HGSMI/HGSMI.h>
    38 #include <VBox/VBoxVideo.h>
    39 #include <VBox/VBoxVideoGuest.h>
     37#include <HGSMI.h>
     38#include <VBoxVideo.h>
     39#include <VBoxVideoGuest.h>
    4040#include <VBoxDisplay.h>
    4141

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

    r63060 r65381  
    1818#include "VBoxDisp.h"
    1919#include "VBoxDispMini.h"
    20 #include <VBox/HGSMI/HGSMIChSetup.h>
     20#include <HGSMIChSetup.h>
    2121
    2222#ifdef VBOX_VBVA_ADJUST_RECT

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

    r62522 r65381  
    3333 VBoxVideo_DEFS        += VBOX_WITH_VIDEOHWACCEL
    3434endif
    35 VBoxVideo_INCS          = ../../../include .. .
     35VBoxVideo_INCS          = ../../../include .. . $(VBOX_GRAPHICS_INCS)
    3636VBoxVideo_LDFLAGS.x86   = /Entry:DriverEntry@8
    3737VBoxVideo_LDFLAGS.amd64 = /Entry:DriverEntry
    … …  
    9999        $(VBOX_PATH_CROGL_INCLUDE) \
    100100        $(VBOX_PATH_CROGL_GENFILES) \
    101         $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer
     101        $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer \
     102        $(VBOX_GRAPHICS_INCS)
    102103
    103104 VBoxVideoWddm_LDFLAGS.x86 += /Entry:DriverEntry@8

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

    r65193 r65381  
    1818
    1919#include "VBoxMPCommon.h"
    20 #include <VBox/Hardware/VBoxVideoVBE.h>
     20#include <VBoxVideoVBE.h>
    2121
    2222int VBoxMPCmnMapAdapterMemory(PVBOXMP_COMMON pCommon, void **ppv, uint32_t ulOffset, uint32_t ulSize)

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

    r63823 r65381  
    2020
    2121#include "VBoxMPUtils.h"
    22 #include <VBox/VBoxVideoGuest.h>
     22#include <VBoxVideoGuest.h>
    2323
    2424#ifdef VBOX_XPDM_MINIPORT

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

    r65193 r65381  
    2323#endif
    2424#include <wchar.h>
    25 #include <VBox/Hardware/VBoxVideoVBE.h>
     25#include <VBoxVideoVBE.h>
    2626
    2727#ifdef VBOX_WITH_WDDM

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

    r65193 r65381  
    1717
    1818#include "VBoxMPWddm.h"
    19 #include <VBox/Hardware/VBoxVideoVBE.h>
     19#include <VBoxVideoVBE.h>
    2020#include <stdio.h>
    2121

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

    r62522 r65381  
    2121
    2222#include <iprt/cdefs.h>
    23 #include <VBox/VBoxVideo.h>
     23#include <VBoxVideo.h>
    2424
    2525#include "common/VBoxMPUtils.h"

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

    r62522 r65381  
    2121#include <iprt/cdefs.h>
    2222#include <iprt/asm.h>
    23 #include <VBox/VBoxVideo.h>
    24 #include <VBox/HGSMI/HGSMI.h>
     23#include <VBoxVideo.h>
     24#include <HGSMI.h>
    2525
    2626typedef struct _VBOXMP_DEVEXT *PVBOXMP_DEVEXT;

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

    r65193 r65381  
    2626
    2727#include <VBox/VBoxGuestLib.h>
    28 #include <VBox/VBoxVideo.h>
     28#include <VBoxVideo.h>
    2929#include <wingdi.h> /* needed for RGNDATA definition */
    3030#include <VBoxDisplay.h> /* this is from Additions/WINNT/include/ to include escape codes */
    31 #include <VBox/Hardware/VBoxVideoVBE.h>
     31#include <VBoxVideoVBE.h>
    3232#include <VBox/Version.h>
    3333

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

    r65193 r65381  
    2121*********************************************************************************************************************************/
    2222#include "VBoxMPInternal.h"
    23 #include <VBox/Hardware/VBoxVideoVBE.h>
     23#include <VBoxVideoVBE.h>
    2424#include <VBox/VBoxGuestLib.h>
    25 #include <VBox/VBoxVideo.h>
     25#include <VBoxVideo.h>
    2626#include "common/VBoxMPHGSMI.h"
    2727#include "common/VBoxMPCommon.h"

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

    r65193 r65381  
    1919#include "VBoxMPInternal.h"
    2020#include "common/VBoxMPCommon.h"
    21 #include <VBox/Hardware/VBoxVideoVBE.h>
     21#include <VBoxVideoVBE.h>
    2222#include <VBox/VBoxGuestLib.h>
    23 #include <VBox/VBoxVideo.h>
     23#include <VBoxVideo.h>
    2424
    2525/* Note: in/out parameters passed to VBoxDrvStartIO point to the same memory location.

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

    r63566 r65381  
    1717
    1818#include "VBoxMPInternal.h"
    19 #include <VBox/VBoxVideo.h>
     19#include <VBoxVideo.h>
    2020#include <VBox/VBoxGuestLib.h>
    2121#include <iprt/asm.h>

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

    r63107 r65381  
    194194#wined3d_DEFS        += VBOX_WITH_WINE_FIXES
    195195wined3d_INCS        := \
    196         vbox/libWineStub/include
     196        vbox/libWineStub/include \
     197        $(VBOX_GRAPHICS_INCS)
    197198wined3d_SOURCES     := \
    198199        wined3d/arb_program_shader.c \

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

    r63025 r65381  
    3939#include "winternl.h"
    4040#ifdef VBOX_WITH_WDDM
    41 #include <VBox/VBoxCrHgsmi.h>
     41#include <VBoxCrHgsmi.h>
    4242#endif
    4343

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

    r63025 r65381  
    1919#include "vboxext.h"
    2020#ifdef VBOX_WITH_WDDM
    21 #include <VBox/VBoxCrHgsmi.h>
     21#include <VBoxCrHgsmi.h>
    2222#include <iprt/err.h>
    2323#endif

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

    r63020 r65381  
    8383# define VBoxTlsRefSetImpl(_tls, _val) (TlsSetValue((DWORD)(_tls), (_val)))
    8484# define VBoxTlsRefAssertImpl Assert
    85 # include <VBox/VBoxVideo3D.h>
     85# include <VBoxVideo3D.h>
    8686#endif
    8787

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

    r63107 r65381  
    2929        VBOX_WITH_HGCM \
    3030        VBOX_BUILD_TARGET=\"$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)\"
    31 VBoxTray_INCS     = ../include
     31VBoxTray_INCS     = ../include $(VBOX_GRAPHICS_INCS)
    3232VBoxTray_SOURCES  = \
    3333        VBoxTray.cpp \

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

    r65193 r65381  
    8484
    8585/* for VBOX_VIDEO_MAX_SCREENS definition */
    86 #include <VBox/Hardware/VBoxVideoVBE.h>
     86#include <VBoxVideo.h>
    8787
    8888typedef struct VBOXWDDM_RECOMMENDVIDPN_SOURCE

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

    r65193 r65381  
    1717 */
    1818
    19 #include <VBox/VBoxVideoGuest.h>
    20 #include <VBox/VBoxVideo.h>
    21 #include <VBox/Hardware/VBoxVideoVBE.h>
     19#include <VBoxVideoGuest.h>
     20#include <VBoxVideoVBE.h>
    2221
    2322#include <iprt/asm.h>

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

    r65193 r65381  
    1717 */
    1818
    19 #include <VBox/VBoxVideoGuest.h>
    20 #include <VBox/VBoxVideo.h>
    21 #include <VBox/Hardware/VBoxVideoVBE.h>
     19#include <VBoxVideoGuest.h>
     20#include <VBoxVideoVBE.h>
    2221
    2322#ifndef VBOX_GUESTR3XF86MOD

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

    r64650 r65381  
    1717 */
    1818
    19 #include <VBox/VBoxVideoGuest.h>
    20 #include <VBox/VBoxVideo.h>
     19#include <VBoxVideoGuest.h>
    2120#include <VBox/err.h>
    2221// #include <VBox/log.h>

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

    r64295 r65381  
    6666#
    6767VBoxOGL_TEMPLATE       = VBOXCROGLR3GUESTDLL
    68 VBoxOGL_INCS           = .
     68VBoxOGL_INCS           = . $(VBOX_GRAPHICS_INCS)
    6969if1of ($(KBUILD_TARGET), linux solaris freebsd)
    7070 ifndef VBOX_USE_SYSTEM_GL_HEADERS
    … …  
    448448VBoxOGLarrayspu_TEMPLATE      = VBOXCROGLR3GUESTDLL
    449449VBoxOGLarrayspu_INCS          = \
    450         array
     450        array \
     451        $(VBOX_GRAPHICS_INCS)
    451452if1of ($(KBUILD_TARGET), linux solaris freebsd)
    452453 VBoxOGLarrayspu_INCS += \
    … …  
    496497VBoxOGLpassthroughspu_TEMPLATE    = VBOXCROGLR3GUESTDLL
    497498VBoxOGLpassthroughspu_INCS        = \
    498         passthrough
     499        passthrough \
     500        $(VBOX_GRAPHICS_INCS)
    499501if1of ($(KBUILD_TARGET), linux solaris freebsd)
    500502 VBoxOGLpassthroughspu_INCS += \
    … …  
    545547VBoxOGLpackspu_DEFS          = TRACKS_STATE=1 PACKS=1
    546548VBoxOGLpackspu_INCS          = \
    547         pack
     549        pack \
     550        $(VBOX_GRAPHICS_INCS)
    548551if1of ($(KBUILD_TARGET), linux solaris freebsd)
    549552 VBoxOGLpackspu_INCS += \
    … …  
    651654VBoxOGLfeedbackspu_TEMPLATE    = VBOXCROGLR3GUESTDLL
    652655VBoxOGLfeedbackspu_INCS        = \
    653         feedback
     656        feedback \
     657        $(VBOX_GRAPHICS_INCS)
    654658if1of ($(KBUILD_TARGET), linux solaris freebsd)
    655659 VBoxOGLfeedbackspu_INCS += \

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

    r62848 r65381  
    2323
    2424#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
    25 # include <VBox/VBoxCrHgsmi.h>
    26 # include <VBox/VBoxUhgsmi.h>
     25# include <VBoxCrHgsmi.h>
     26# include <VBoxUhgsmi.h>
    2727#endif
    2828

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

    r65065 r65381  
    3535
    3636#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
    37 # include <VBox/VBoxCrHgsmi.h>
     37# include <VBoxCrHgsmi.h>
    3838#endif
    3939

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

    r56008 r65381  
    2828
    2929#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
    30 # include <VBox/VBoxCrHgsmi.h>
    31 # include <VBox/VBoxUhgsmi.h>
     30# include <VBoxCrHgsmi.h>
     31# include <VBoxUhgsmi.h>
    3232#endif
    3333

  • TabularUnified trunk/src/VBox/Additions/haiku/VBoxVideo/driver/Makefile.kmk

    r62526 r65381  
    6969        $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuestLib \
    7070        $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest \
    71         $(PATH_ROOT)/src/VBox/Runtime/r0drv/haiku
     71        $(PATH_ROOT)/src/VBox/Runtime/r0drv/haiku \
     72        $(VBOX_GRAPHICS_INCS)
    7273vboxvideo_SOURCES         = \
    7374        driver.cpp \

  • TabularUnified trunk/src/VBox/Additions/haiku/VBoxVideo/driver/driver.cpp

    r63566 r65381  
    5656#include <graphic_driver.h>
    5757#include <VBoxGuest-haiku.h>
    58 #include <VBox/VBoxVideoGuest.h>
     58#include <VBoxVideoGuest.h>
    5959#include "../common/VBoxVideo_common.h"
    6060

  • TabularUnified trunk/src/VBox/Additions/linux/drm/Makefile.kmk

    r62527 r65381  
    5353vboxvideo_drm_INCS           += \
    5454  ../../../Runtime/include \
    55   ../../../Runtime/r0drv/linux
     55  ../../../Runtime/r0drv/linux \
     56  $(VBOX_GRAPHICS_INCS)
    5657vboxvideo_drm_SOURCES         = \
    5758  ../../common/VBoxVideo/HGSMIBase.cpp \

  • TabularUnified trunk/src/VBox/Additions/linux/drm/files_vboxvideo_drv

    r65193 r65381  
    3636    ${PATH_ROOT}/include/VBox/err.h=>include/VBox/err.h \
    3737    ${PATH_ROOT}/include/VBox/types.h=>include/VBox/types.h \
    38     ${PATH_ROOT}/include/VBox/VBoxVideo.h=>include/VBox/VBoxVideo.h \
    39     ${PATH_ROOT}/include/VBox/VBoxVideoGuest.h=>include/VBox/VBoxVideoGuest.h \
    40     ${PATH_ROOT}/include/VBox/HGSMI/HGSMI.h=>include/VBox/HGSMI/HGSMI.h \
    41     ${PATH_ROOT}/include/VBox/HGSMI/HGSMIChannels.h=>include/VBox/HGSMI/HGSMIChannels.h \
    42     ${PATH_ROOT}/include/VBox/HGSMI/HGSMIChSetup.h=>include/VBox/HGSMI/HGSMIChSetup.h \
    43     ${PATH_ROOT}/include/VBox/HGSMI/HGSMIDefs.h=>include/VBox/HGSMI/HGSMIDefs.h \
    44     ${PATH_ROOT}/include/VBox/HGSMI/HGSMIMemAlloc.h=>include/VBox/HGSMI/HGSMIMemAlloc.h \
    45     ${PATH_ROOT}/include/VBox/Hardware/VBoxVideoVBE.h=>include/VBox/Hardware/VBoxVideoVBE.h \
     38    ${PATH_ROOT}/include/VBox/Graphics/VBoxVideo.h=>include/VBoxVideo.h \
     39    ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoGuest.h=>include/VBoxVideoGuest.h \
     40    ${PATH_ROOT}/include/VBox/Graphics/HGSMI.h=>include/HGSMI.h \
     41    ${PATH_ROOT}/include/VBox/Graphics/HGSMIChannels.h=>include/HGSMIChannels.h \
     42    ${PATH_ROOT}/include/VBox/Graphics/HGSMIChSetup.h=>include/HGSMIChSetup.h \
     43    ${PATH_ROOT}/include/VBox/Graphics/HGSMIDefs.h=>include/HGSMIDefs.h \
     44    ${PATH_ROOT}/include/VBox/Graphics/HGSMIMemAlloc.h=>include/HGSMIMemAlloc.h \
     45    ${PATH_ROOT}/include/VBox/Graphics/VBoxVideoVBE.h=>include/VBoxVideoVBE.h \
    4646    ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp=>HGSMIBase.c \
    4747    ${PATH_ROOT}/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp=>Modesetting.c \

  • TabularUnified trunk/src/VBox/Additions/linux/drm/vbox_drv.h

    r64919 r65381  
    5151#define LOG_GROUP LOG_GROUP_DEV_VGA
    5252
    53 #include <VBox/VBoxVideoGuest.h>
     53#include <VBoxVideoGuest.h>
    5454
    5555#include <drm/drmP.h>

  • TabularUnified trunk/src/VBox/Additions/linux/drm/vbox_fb.c

    r64959 r65381  
    4848/* Include from most specific to most general to be able to override things. */
    4949#include "vbox_drv.h"
    50 #include <VBox/VBoxVideo.h>
     50#include <VBoxVideo.h>
    5151
    5252#include <linux/module.h>

  • TabularUnified trunk/src/VBox/Additions/linux/drm/vbox_irq.c

    r64919 r65381  
    4646#include "vbox_drv.h"
    4747
    48 #include <VBox/VBoxVideo.h>
     48#include <VBoxVideo.h>
    4949
    5050#include <drm/drm_crtc_helper.h>

  • TabularUnified trunk/src/VBox/Additions/linux/drm/vbox_main.c

    r64425 r65381  
    4848#include "vbox_drv.h"
    4949
    50 #include <VBox/VBoxVideoGuest.h>
    51 #include <VBox/VBoxVideo.h>
     50#include <VBoxVideoGuest.h>
     51#include <VBoxVideoVBE.h>
    5252
    5353#include <drm/drm_fb_helper.h>

  • TabularUnified trunk/src/VBox/Additions/linux/drm/vbox_mode.c

    r64919 r65381  
    5050#include "vbox_drv.h"
    5151
    52 #include <VBox/VBoxVideo.h>
     52#include <VBoxVideo.h>
    5353
    5454#include <linux/export.h>

  • TabularUnified trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

    r63539 r65381  
    3030endif
    3131VBoxClient_DEFS.linux += _GNU_SOURCE
     32VBoxClient_INCS = $(VBOX_GRAPHICS_INCS)
    3233VBoxClient_SOURCES = \
    3334        main.cpp

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

    r64200 r65381  
    3737        $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
    3838        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
    39         $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
     39        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
     40        $(VBOX_GRAPHICS_INCS)
    4041
    4142vboxvideo.c_DEPS = $(VBOX_SVN_REV_HEADER)
    … …  
    9394        $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/randr \
    9495        $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/Xext
    95 vboxvideo_drv_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
     96vboxvideo_drv_INCS += \
     97        $(PATH_ROOT)/src/VBox/Runtime/include \
     98        $(VBOX_GRAPHICS_INCS)
    9699vboxvideo_drv_SOURCES = \
    97100        getmode.c \
    … …  
    381384 vboxvideo_drv_system_INCS += \
    382385        $(PATH_ROOT)/src/VBox/Runtime/include \
     386        $(VBOX_GRAPHICS_INCS) \
    383387        /usr/include/x11 \
    384388        /usr/include/xorg \

  • TabularUnified trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

    r65193 r65381  
    5757#include <VBox/VBoxGuest.h>
    5858#include <VBox/VBoxGuestLib.h>
    59 #include <VBox/Hardware/VBoxVideoVBE.h>
     59#include <VBoxVideoVBE.h>
    6060#include "version-generated.h"
    6161#include "product-generated.h"

  • TabularUnified trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

    r65193 r65381  
    5353#define _VBOXVIDEO_H_
    5454
    55 #include <VBox/VBoxVideoGuest.h>
    56 #include <VBox/VBoxVideo.h>
     55#include <VBoxVideoGuest.h>
     56#include <VBoxVideo.h>
    5757#include "version-generated.h"
    5858
    … …  
    103103#define BOOL_STR(a) ((a) ? "TRUE" : "FALSE")
    104104
    105 #include <VBox/Hardware/VBoxVideoVBE.h>
     105#include <VBoxVideoVBE.h>
    106106
    107107#include "xf86str.h"

  • TabularUnified trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk

    r64960 r65381  
    3030 VBoxVgaBios386_CFLAGS = -3
    3131 VBoxVgaBios386_DEFS = VBE VBOX_BIOS_CPU=80386
     32 VBoxVgaBios386_INCS = $(VBOX_GRAPHICS_INCS)
    3233 VBoxVgaBios386_SOURCES = \
    3334        vgarom.asm \

  • TabularUnified trunk/src/VBox/Devices/Graphics/BIOS/vbe.h

    r65193 r65381  
    44#include "vgabios.h"
    55
    6 #include <VBox/Hardware/VBoxVideoVBE.h>
     6#include <VBoxVideoVBE.h>
    77
    88// DISPI helper function

  • TabularUnified trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

    r65345 r65381  
    146146
    147147#include <VBox/VMMDev.h>
    148 #include <VBox/VBoxVideo.h>
     148#include <VBoxVideo.h>
    149149#include <VBox/bioslogo.h>
    150150

  • TabularUnified trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-info.cpp

    r63211 r65381  
    2929
    3030#include <VBox/vmm/pgm.h> /* required by DevVGA.h */
    31 #include <VBox/VBoxVideo.h> /* required by DevVGA.h */
     31#include <VBoxVideo.h> /* required by DevVGA.h */
    3232
    3333/* should go BEFORE any other DevVGA include to make all DevVGA.h config defines be visible */

  • TabularUnified trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

    r65101 r65381  
    3939#include <iprt/mem.h>
    4040
    41 #include <VBox/VBoxVideo.h> /* required by DevVGA.h */
     41#include <VBoxVideo.h> /* required by DevVGA.h */
    4242
    4343/* should go BEFORE any other DevVGA include to make all DevVGA.h config defines be visible */

  • TabularUnified trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-savedstate.cpp

    r63562 r65381  
    2929
    3030#include <VBox/vmm/pgm.h> /* required by DevVGA.h */
    31 #include <VBox/VBoxVideo.h> /* required by DevVGA.h */
     31#include <VBoxVideo.h> /* required by DevVGA.h */
    3232
    3333/* should go BEFORE any other DevVGA include to make all DevVGA.h config defines be visible */

  • TabularUnified trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.cpp

    r63562 r65381  
    3333#include <iprt/avl.h>
    3434
    35 #include <VBox/VBoxVideo.h> /* required by DevVGA.h */
     35#include <VBoxVideo.h> /* required by DevVGA.h */
    3636
    3737/* should go BEFORE any other DevVGA include to make all DevVGA.h config defines be visible */

  • TabularUnified trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp

    r64483 r65381  
    3333#include <iprt/avl.h>
    3434
    35 #include <VBox/VBoxVideo.h> /* required by DevVGA.h */
     35#include <VBoxVideo.h> /* required by DevVGA.h */
    3636
    3737/* should go BEFORE any other DevVGA include to make all DevVGA.h config defines be visible */

  • TabularUnified trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d.cpp

    r65101 r65381  
    2929
    3030#include <VBox/vmm/pgm.h> /* required by DevVGA.h */
    31 #include <VBox/VBoxVideo.h> /* required by DevVGA.h */
     31#include <VBoxVideo.h> /* required by DevVGA.h */
    3232
    3333/* should go BEFORE any other DevVGA include to make all DevVGA.h config defines be visible */

  • TabularUnified trunk/src/VBox/Devices/Graphics/DevVGA.cpp

    r65303 r65381  
    125125
    126126#include <VBox/VMMDev.h>
    127 #include <VBox/VBoxVideo.h>
     127#include <VBoxVideo.h>
    128128#include <VBox/bioslogo.h>
    129129

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

    r65294 r65381  
    5858#endif
    5959
    60 #include <VBox/Hardware/VBoxVideoVBE.h>
     60#include <VBoxVideoVBE.h>
    6161
    6262#ifdef VBOX_WITH_HGSMI
    … …  
    8282#ifdef CONFIG_BOCHS_VBE
    8383
    84 /* Cross reference with <VBox/Hardware/VBoxVideoVBE.h> */
     84/* Cross reference with <VBoxVideoVBE.h> */
    8585#define VBE_DISPI_INDEX_NB_SAVED        0xb /* Number of saved registers (vbe_regs array) */
    8686#define VBE_DISPI_INDEX_NB              0xc /* Total number of VBE registers */

  • TabularUnified trunk/src/VBox/Devices/Graphics/DevVGAModes.h

    r65193 r65381  
    2121#ifdef VBE_NEW_DYN_LIST
    2222
    23 #include <VBox/Hardware/VBoxVideoVBE.h>
     23#include <VBoxVideoVBE.h>
    2424
    2525/* VBE Mode Numbers */

  • TabularUnified trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

    r64766 r65381  
    2626#include <VBox/vmm/ssm.h>
    2727#include <VBox/VMMDev.h>
    28 #include <VBox/VBoxVideo.h>
     28#include <VBoxVideo.h>
    2929#include <iprt/alloc.h>
    3030#include <iprt/assert.h>

  • TabularUnified trunk/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp

    r64766 r65381  
    2323#include <VBox/vmm/pdmdev.h>
    2424#include <VBox/vmm/pgm.h>
    25 #include <VBox/VBoxVideo.h>
     25#include <VBoxVideo.h>
    2626#include <iprt/semaphore.h>
    2727#include <iprt/thread.h>
    … …  
    3434#include "HGSMI/SHGSMIHost.h"
    3535
    36 #include <VBox/VBoxVideo3D.h>
    37 #include <VBox/VBoxVideoHost3D.h>
     36#include <VBoxVideo3D.h>
     37#include <VBoxVideoHost3D.h>
    3838
    3939#ifdef DEBUG_misha

  • TabularUnified trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

    r62932 r65381  
    7272
    7373#include "HGSMIHost.h"
    74 #include <VBox/HGSMI/HGSMIChannels.h>
    75 #include <VBox/HGSMI/HGSMIChSetup.h>
     74#include <HGSMIChannels.h>
     75#include <HGSMIChSetup.h>
    7676
    7777#include "../DevVGASavedState.h"

  • TabularUnified trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.h

    r62514 r65381  
    2424#include <VBox/vmm/vm.h>
    2525
    26 #include <VBox/HGSMI/HGSMI.h>
    27 #include <VBox/HGSMI/HGSMIChSetup.h>
     26#include <HGSMI.h>
     27#include <HGSMIChSetup.h>
    2828
    2929struct HGSMIINSTANCE;

  • TabularUnified trunk/src/VBox/Devices/Graphics/HGSMI/SHGSMIHost.cpp

    r62541 r65381  
    1717
    1818#include "SHGSMIHost.h"
    19 #include <VBox/VBoxVideo.h>
     19#include <VBoxVideo.h>
    2020
    2121/*

  • TabularUnified trunk/src/VBox/Devices/Graphics/shaderlib/directx.c

    r63478 r65381  
    3838
    3939#ifdef VBOX_WITH_WDDM
    40 # include <VBox/VBoxCrHgsmi.h>
     40# include <VBoxCrHgsmi.h>
    4141#endif
    4242

  • TabularUnified trunk/src/VBox/Devices/Graphics/shaderlib/wined3d_private.h

    r62950 r65381  
    8585# define VBoxTlsRefSetImpl(_tls, _val) (TlsSetValue((DWORD)(_tls), (_val)))
    8686# define VBoxTlsRefAssertImpl Assert
    87 # include <VBox/VBoxVideo3D.h>
     87# include <VBoxVideo3D.h>
    8888#endif
    8989

  • TabularUnified trunk/src/VBox/Devices/Makefile.kmk

    r65338 r65381  
    115115 VBoxDD_INCS             = \
    116116        build \
    117         Network/slirp
     117        Network/slirp \
     118        $(VBOX_GRAPHICS_INCS)
    118119 VBoxDD_DEFS             = \
    119120        VBOX_ACPI \
    … …  
    901902
    902903 # For finding and generating vbetables.h (see Graphics/BIOS/Makefile.kmk).
    903  Graphics/DevVGA.cpp_INCS = $(VgaBiosBin_0_OUTDIR)
     904 Graphics/DevVGA.cpp_INCS = $(VgaBiosBin_0_OUTDIR) $(VBOX_GRAPHICS_INCS)
    904905 Graphics/DevVGA.cpp_DEPS = $(VgaBiosBin_0_OUTDIR)/vbetables.h
    905906
    … …  
    916917  endif
    917918  VBoxDDRC_DEFS           = $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,)
    918   VBoxDDRC_INCS           = build
     919  VBoxDDRC_INCS           = build $(VBOX_GRAPHICS_INCS)
    919920  VBoxDDRC_SOURCES        = \
    920921        Bus/DevPCI.cpp \
    … …  
    10751076 VBoxDDR0_DEFS           = IN_RT_R0 $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) # - WTF is IN_RT_R0 doing here?
    10761077 VBoxDDR0_DEFS.win      += VBOX_WITH_WIN_PARPORT_SUP
    1077  VBoxDDR0_INCS           = build
     1078 VBoxDDR0_INCS           = build $(VBOX_GRAPHICS_INCS)
    10781079 VBoxDDR0_SDKS.win        = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
    10791080 VBoxDDR0_SOURCES        = \
    … …  
    14811482        __stdcall= \
    14821483        ms_abi=
     1484 VBoxSVGA3D_INCS = $(VBOX_GRAPHICS_INCS)
    14831485 VBoxSVGA3D_INCS.win    := \
    14841486        Graphics/shaderlib/libWineStub/include

  • TabularUnified trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

    r64391 r65381  
    8383/* Enable dev_vmm Log3 statements to get IRQ-related logging. */
    8484#define LOG_GROUP LOG_GROUP_DEV_VMM
    85 #include <VBox/VBoxVideo.h>  /* For VBVA definitions. */
     85#include <VBoxVideo.h>  /* For VBVA definitions. */
    8686#include <VBox/VMMDev.h>
    8787#include <VBox/vmm/mm.h>

  • TabularUnified trunk/src/VBox/Devices/testcase/Makefile.kmk

    r65338 r65381  
    7373        $(VBOX_PATH_DEVICES_SRC)/build \
    7474        $(VBOX_PATH_DEVICES_SRC)/Bus \
    75         $(VBOX_DEVICES_TEST_OUT_DIR)
     75        $(VBOX_DEVICES_TEST_OUT_DIR) \
     76        $(VBOX_GRAPHICS_INCS)
    7677 tstDeviceStructSizeRC_INCS     += $(VBOX_PATH_VMM_DEVICES_SRC)
    7778endif # VBOX_WITH_RAW_MODE
    … …  
    8687        $(VBOX_PATH_DEVICES_SRC)/build \
    8788        $(VBOX_PATH_DEVICES_SRC)/Bus \
    88         $(VBOX_DEVICES_TEST_OUT_DIR)
     89        $(VBOX_DEVICES_TEST_OUT_DIR) \
     90        $(VBOX_GRAPHICS_INCS)
    8991tstDeviceStructSize_SOURCES  = tstDeviceStructSize.cpp
    9092tstDeviceStructSize_CLEAN    = \

  • TabularUnified trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk

    r65263 r65381  
    4646VBoxHeadless_TEMPLATE  := $(if $(VBOX_WITH_HARDENING),VBOXMAINCLIENTDLL,VBOXMAINCLIENTEXE)
    4747VBoxHeadless_DEFS      += $(if $(VBOX_WITH_VIDEOREC),VBOX_WITH_VIDEOREC,)
     48VBoxHeadless_INCS      = $(VBOX_GRAPHICS_INCS)
    4849VBoxHeadless_SOURCES    = VBoxHeadless.cpp
    4950ifdef VBOX_WITH_GUEST_PROPS

  • TabularUnified trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

    r65263 r65381  
    4242#include <iprt/env.h>
    4343#include <VBox/err.h>
    44 #include <VBox/VBoxVideo.h>
     44#include <VBoxVideo.h>
    4545
    4646#ifdef VBOX_WITH_VIDEOREC

  • TabularUnified trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk

    r62493 r65381  
    6969
    7070VBoxSDL_INCS = \
    71         $(VBoxSDL_0_OUTDIR)
     71        $(VBoxSDL_0_OUTDIR) \
     72        $(VBOX_GRAPHICS_INCS)
    7273ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    7374VBoxSDL_INCS += \

  • TabularUnified trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

    r63567 r65381  
    6666#include <VBox/log.h>
    6767#include <VBox/version.h>
    68 #include <VBox/VBoxVideo.h>
     68#include <VBoxVideo.h>
    6969#include <VBox/com/listeners.h>
    7070

  • TabularUnified trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r65153 r65381  
    210210VirtualBox_INCS = \
    211211        $(VBOX_GUI_INC_DIRS) \
    212         $(VirtualBox_0_OUTDIR)/include
     212        $(VirtualBox_0_OUTDIR)/include \
     213        $(VBOX_GRAPHICS_INCS)
    213214
    214215# Necessary for the hdd backend enumeration

  • TabularUnified trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

    r63567 r65381  
    6262
    6363#ifdef VBOX_WITH_VIDEOHWACCEL
    64 # include <VBox/VBoxVideo.h>
     64# include <VBoxVideo.h>
    6565# include <VBox/vmm/ssm.h>
    6666#endif /* VBOX_WITH_VIDEOHWACCEL */

  • TabularUnified trunk/src/VBox/Frontends/VirtualBox/src/precomp.h

    r64762 r65381  
    277277//#include <VBox/VBoxKeyboard.h> - includes X11/X.h which causes trouble.
    278278//#include <VBox/VBoxOGL.h> - only used once
    279 //#include <VBox/VBoxVideo.h> - only used twice
     279//#include <VBoxVideo.h> - only used twice
    280280#ifdef VBOX_WITH_VIDEOHWACCEL
    281 //# include <VBox/VBoxVideo3D.h> - only used once
     281//# include <VBoxVideo3D.h> - only used once
    282282#endif
    283283#include <VBox/com/Guid.h>

  • TabularUnified trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

    r64593 r65381  
    5555/* Other VBox includes: */
    5656#include <iprt/critsect.h>
    57 #include <VBox/VBoxVideo3D.h>
     57#include <VBoxVideo3D.h>
    5858
    5959/* Other includes: */

  • TabularUnified trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

    r63899 r65381  
    9191/* Other VBox includes: */
    9292#include <VBox/VBoxOGL.h>
    93 #include <VBox/VBoxVideo.h>
     93#include <VBoxVideo.h>
    9494#ifdef VBOX_WS_MAC
    9595# include <VBox/err.h>

  • TabularUnified trunk/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp

    r64650 r65381  
    2525#include <iprt/string.h>
    2626
    27 #include <VBox/HGSMI/HGSMI.h>
     27#include <HGSMI.h>
    2828// #include <VBox/log.h>
    2929

  • TabularUnified trunk/src/VBox/GuestHost/HGSMI/HGSMIMemAlloc.cpp

    r64766 r65381  
    5353 *  * smaller free blocks are merged if they can build a requested larger block.
    5454 */
    55 #include <VBox/HGSMI/HGSMIMemAlloc.h>
    56 #include <VBox/HGSMI/HGSMI.h>
     55#include <HGSMIMemAlloc.h>
     56#include <HGSMI.h>
    5757
    5858#include <iprt/err.h>

  • TabularUnified trunk/src/VBox/GuestHost/HGSMI/Makefile.kmk

    r62492 r65381  
    2929HGSMIGuestR0Lib_TEMPLATE     = VBOXGUESTR0LIB
    3030HGSMIGuestR0Lib_DEFS         =
     31HGSMIGuestR0Lib_INCS         = $(VBOX_GRAPHICS_INCS)
    3132HGSMIGuestR0Lib_SOURCES      = \
    3233        HGSMICommon.cpp \
    … …  
    4041HGSMIHostR3Lib_TEMPLATE      = VBOXR3
    4142HGSMIHostR3Lib_DEFS          =
     43HGSMIHostR3Lib_INCS          = $(VBOX_GRAPHICS_INCS)
    4244HGSMIHostR3Lib_SOURCES       = \
    4345        HGSMICommon.cpp \

  • TabularUnified trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

    r64269 r65381  
    5353VBoxOGLcrutil_SDKS.win      = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
    5454VBoxOGLcrutil_INTERMEDIATES = $(VBOX_PATH_CROGL_GENFILES)/cr_opcodes.h
     55VBoxOGLcrutil_INCS += \
     56        $(VBOX_GRAPHICS_INCS)
    5557if1of ($(KBUILD_TARGET), linux solaris freebsd)
    5658 VBoxOGLcrutil_INCS += \
    … …  
    197199VBoxOGLcrpacker_TEMPLATE = VBOXCROGLR3GUESTLIB
    198200VBoxOGLcrpacker_INCS = \
    199         packer
     201        packer \
     202        $(VBOX_GRAPHICS_INCS)
    200203if1of ($(KBUILD_TARGET), linux solaris freebsd)
    201204 VBoxOGLcrpacker_INCS += \
    … …  
    349352VBoxOGLspuload_INTERMEDIATES = \
    350353        $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h
     354VBoxOGLspuload_INCS += \
     355        $(VBOX_GRAPHICS_INCS)
    351356if1of ($(KBUILD_TARGET), linux solaris freebsd)
    352357 VBoxOGLspuload_INCS += \
    … …  
    421426VBoxOGLcrstate_TEMPLATE = VBOXCROGLR3GUESTLIB
    422427VBoxOGLcrstate_INCS = \
    423         state_tracker
     428        state_tracker \
     429        $(VBOX_GRAPHICS_INCS)
    424430if1of ($(KBUILD_TARGET), linux solaris freebsd)
    425431 VBoxOGLcrstate_INCS += \
    … …  
    623629VBoxOGLerrorspu_INTERMEDIATES = \
    624630        $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h
     631VBoxOGLerrorspu_INCS += \
     632        $(VBOX_GRAPHICS_INCS)
    625633if1of ($(KBUILD_TARGET), linux solaris freebsd)
    626634 VBoxOGLerrorspu_INCS += \

  • TabularUnified trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h

    r65193 r65381  
    3232#include <VBox/vmm/ssm.h>
    3333
    34 #include <VBox/VBoxVideo.h>
    35 #include <VBox/Hardware/VBoxVideoVBE.h>
    36 #include <VBox/VBoxVideo3D.h>
    37 #include <VBox/VBoxVideoHost3D.h>
     34#include <VBoxVideo.h>
     35#include <VBoxVideoVBE.h>
     36#include <VBoxVideo3D.h>
     37#include <VBoxVideoHost3D.h>
    3838
    3939#ifdef __cplusplus

  • TabularUnified trunk/src/VBox/GuestHost/OpenGL/include/cr_threads.h

    r62812 r65381  
    110110#define VBoxTlsRefSetImpl(_tls, _val) (crSetTSD((CRtsd*)(_tls), (_val)))
    111111#define VBoxTlsRefAssertImpl CRASSERT
    112 #include <VBox/VBoxVideo3D.h>
     112#include <VBoxVideo3D.h>
    113113
    114114#ifdef __cplusplus

  • TabularUnified trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

    r63199 r65381  
    4747
    4848#if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST)
    49 #include <VBox/VBoxCrHgsmi.h>
     49#include <VBoxCrHgsmi.h>
    5050#endif
    5151

  • TabularUnified trunk/src/VBox/GuestHost/OpenGL/util/vboxhgsmi.c

    r62680 r65381  
    4343#include <iprt/assert.h>
    4444
    45 #include <VBox/VBoxCrHgsmi.h>
     45#include <VBoxCrHgsmi.h>
    4646#if 1 /** @todo Try use the Vbgl interface instead of talking directly to the driver? */
    4747# include <VBox/VBoxGuest.h>

  • TabularUnified trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

    r64067 r65381  
    5959VBoxSharedCrOpenGL_INTERMEDIATES = \
    6060        $(TEMPLATE_VBOXMAINEXE_INTERMEDIATES)
     61VBoxSharedCrOpenGL_INCS = $(VBOX_GRAPHICS_INCS)
    6162VBoxSharedCrOpenGL_INCS.win = \
    6263        $(VBOX_PATH_SDK)/bindings/mscom/include
    … …  
    106107VBoxOGLcrserverlib_INCS  = \
    107108        . \
    108         crserverlib
     109        crserverlib \
     110        $(VBOX_GRAPHICS_INCS)
    109111VBoxOGLcrserverlib_INTERMEDIATES = \
    110112        $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h \
    … …  
    212214VBoxOGLcrunpacker_TEMPLATE       = VBOXCROGLR3HOSTLIB
    213215VBoxOGLcrunpacker_INCS           = \
    214         unpacker
     216        unpacker \
     217        $(VBOX_GRAPHICS_INCS)
    215218VBoxOGLcrunpacker_INTERMEDIATES  = \
    216219        $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h \
    … …  
    364367        $(VBOX_PATH_CROGL_GENFILES)/state/cr_currentpointers.h \
    365368        $(VBOX_PATH_CROGL_GENFILES)/state/cr_statefuncs.h
     369VBoxOGLrenderspu_INCS = $(VBOX_GRAPHICS_INCS)
    366370VBoxOGLrenderspu_SOURCES = \
    367371        render/renderspu.c \

  • TabularUnified trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h

    r55971 r65381  
    1919
    2020#ifdef VBOX_WITH_CRHGSMI
    21 # include <VBox/VBoxVideo.h>
     21# include <VBoxVideo.h>
    2222
    2323#include <iprt/cdefs.h>

  • TabularUnified trunk/src/VBox/HostServices/SharedOpenGL/dlm/dlm_generated.py

    r63942 r65381  
    272272#define _DLM_GENERATED_H
    273273
    274 #include <VBox/VBoxUhgsmi.h>
     274#include <VBoxUhgsmi.h>
    275275
    276276/* DO NOT EDIT.  This file is auto-generated by dlm_generated.py. */

  • TabularUnified trunk/src/VBox/HostServices/SharedOpenGL/dlm/dlm_pointers.h

    r54905 r65381  
    11/* $Id$ */
    2 #include <VBox/VBoxUhgsmi.h>
     2#include <VBoxUhgsmi.h>
    33
    44#include "cr_dlm.h"

  • TabularUnified trunk/src/VBox/Main/Makefile.kmk

    r65364 r65381  
    331331        $(dir $(VBOX_XML_SCHEMADEFS_H)) \
    332332        $(VBOX_MAIN_APIWRAPPER_INCS) \
    333         .
     333        . \
     334        $(VBOX_GRAPHICS_INCS)
    334335VBoxSVC_INCS.win = \
    335336        $(VBoxCOM_0_OUTDIR)
    … …  
    734735        $(VBOX_MAIN_APIWRAPPER_INCS) \
    735736        $(dir $(VBOX_XML_SCHEMADEFS_H)) \
    736        $(VBOX_MAIN_APIWRAPPER_DIR)/dtrace
     737        $(VBOX_MAIN_APIWRAPPER_DIR)/dtrace \
     738        $(VBOX_GRAPHICS_INCS)
    737739VBoxC_INCS.win      = \
    738740        $(VBoxCOM_0_OUTDIR) \

  • TabularUnified trunk/src/VBox/Main/include/DisplayImpl.h

    r65263 r65381  
    2424#include <VBox/vmm/pdmdrv.h>
    2525#include <VBox/VMMDev.h>
    26 #include <VBox/VBoxVideo.h>
     26#include <VBoxVideo.h>
    2727#include <VBox/vmm/pdmifs.h>
    2828#include "DisplayWrap.h"

  • TabularUnified trunk/src/VBox/Main/src-all/DisplayUtils.cpp

    r63563 r65381  
    2121#include <VBox/err.h>
    2222#include <VBox/vmm/ssm.h>
    23 #include <VBox/VBoxVideo.h>
     23#include <VBoxVideo.h>
    2424
    2525int readSavedDisplayScreenshot(const Utf8Str &strStateFilePath, uint32_t u32Type, uint8_t **ppu8Data, uint32_t *pcbData,

  • TabularUnified trunk/src/VBox/Main/src-client/DisplayImpl.cpp

    r65363 r65381  
    4242
    4343#ifdef VBOX_WITH_VIDEOHWACCEL
    44 # include <VBox/VBoxVideo.h>
     44# include <VBoxVideo.h>
    4545#endif
    4646

  • TabularUnified trunk/src/VBox/Main/xml/VirtualBox-settings.xsd

    r65193 r65381  
    140140  <xsd:restriction base="xsd:unsignedInt">
    141141    <xsd:minInclusive value="1"/>
    142     <!-- This should be in sync with VBOX_VIDEO_MAX_SCREENS in VBoxVideoVBE.h -->
     142    <!-- This should be in sync with VBOX_VIDEO_MAX_SCREENS in VBoxVideo.h -->
    143143    <xsd:maxInclusive value="64"/>
    144144  </xsd:restriction>
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette