VirtualBox

Changeset 65381 in vbox for trunk/src/VBox/Devices


Ignore:
Timestamp:
Jan 20, 2017 9:23:53 AM (8 years ago)
Author:
vboxsync
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/Devices
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • 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 \

  • 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

  • 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

  • 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 */

  • 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 */

  • 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 */

  • 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 */

  • 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 */

  • 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 */

  • 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

  • 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 */

  • 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 */

  • 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>

  • 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

  • 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"

  • 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;

  • 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/*

  • 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

  • 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

  • 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

  • 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>

  • 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    = \
Note: See TracChangeset for help on using the changeset viewer.

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