VirtualBox

Changeset 80399 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Aug 23, 2019 1:42:02 PM (5 years ago)
Author:
vboxsync
Message:

GuestHost/OpenGL: Disable most building most of the obsolete CHromium bits (some things need to stay until the WDDM driver is properly separated and cleaned up), bugref:9529

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

    r80366 r80399  
    3434
    3535ifdef VBOX_WITH_CROGL_ADDITIONS
    36  LIBRARIES += VBoxOGLcrpacker VBoxOGLspuload VBoxOGLcrstate VBoxOGLcrutil VBoxOGLerrorspu
    37 endif
    38 
    39 #
    40 # VBoxOGLcrutil
    41 #
    42 VBoxOGLcrutil_TEMPLATE      = VBOXCROGLR3GUESTLIB
    43 VBoxOGLcrutil_SDKS.win      = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
    44 VBoxOGLcrutil_INTERMEDIATES = $(VBOX_PATH_CROGL_GENFILES)/cr_opcodes.h
    45 VBoxOGLcrutil_INCS += \
    46         $(VBOX_GRAPHICS_INCS)
    47 if1of ($(KBUILD_TARGET), linux solaris freebsd)
    48  VBoxOGLcrutil_INCS += \
    49         $(VBOX_GL_INCS)
    50 endif
    51 VBoxOGLcrutil_SOURCES       = \
    52         util/bufpool.c \
    53         util/dll.c \
    54         util/error.c \
    55         util/hash.c \
    56         util/matrix.c \
    57         util/mem.c \
    58         util/net.c \
    59         util/pixel.c \
    60         util/process.c \
    61         util/string.c \
    62         util/threads.c \
    63         util/vreg.cpp \
    64         util/blitter.cpp \
    65         util/compositor.cpp \
    66         util/htable.cpp \
    67         util/bmpscale.cpp \
    68         util/vboxhgcm.c
    69 VBoxOGLcrutil_LIBS.win = \
    70         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
    71         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib \
    72         $(PATH_SDK_$(VBOX_WINDDK)_LIB)/shlwapi.lib
    73 VBoxOGLcrutil_LIBS = \
    74         $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
    75         $(VBOX_LIB_VBGL_R3_SHARED)
    76 
    77 # Needed by GDEbuger
    78 ifdef CR_NO_GL_SYSTEM_PATH
    79 VBoxOGLcrutil_DEFS       += CR_NO_GL_SYSTEM_PATH
    80 endif
    81 ifdef VBOX_WITH_CRHGSMI
    82 VBoxOGLcrutil_DEFS.win    += VBOX_WITH_CRHGSMI
    83 VBoxOGLcrutil_LIBS.win    += \
    84         $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt$(VBOX_SUFF_LIB) \
    85         $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi$(VBOX_SUFF_LIB)
    86 endif
    87 ifdef VBOX_WITH_WDDM
    88 VBoxOGLcrutil_DEFS.win    += VBOX_WITH_WDDM
    89 VBoxOGLcrutil_DEFS.win    += CR_DEBUG_BACKDOOR_ENABLE
    90 VBoxOGLcrutil_INCS.win    += $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm
    91 VBoxOGLcrutil_LIBS.win    += $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB)
    92 endif
    93 if1of ($(KBUILD_TARGET), linux)
    94 VBoxOGLcrutil_LDFLAGS += -Wl,-z,nodelete
    95 endif
    96 
    97 # vc7 hangs during compilation of this file when optimizations are enabled.
    98 #VBoxOGLcrutil_pixel.c_CFLAGS.win.x86     += -Od
    99 
    100 if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
    101 #
    102 # VBoxOGLcrutil-x86 - x86 VBoxOGLcrutil version built for amd64 build
    103 #
    104 LIBRARIES.win.amd64 += VBoxOGLcrutil-x86
    105 VBoxOGLcrutil-x86_TEMPLATE      = VBOXCROGLR3GUESTLIB
    106 VBoxOGLcrutil-x86_EXTENDS = VBoxOGLcrutil
    107 VBoxOGLcrutil-x86_BLD_TRG_ARCH = x86
    108 VBoxOGLcrutil-x86_LIBS = $(VBOX_LIB_IPRT_GUEST_R3_SHARED_X86) \
    109         $(VBOX_LIB_VBGL_R3_SHARED_X86)
    110 VBoxOGLcrutil-x86_LIBS.win = \
    111         $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/ddraw.lib \
    112         $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/dxguid.lib
    113 ifdef VBOX_WITH_CRHGSMI
    114 # VBOX_WITH_CRHGSMI define is inherited from VBoxOGLcrutil
    115 VBoxOGLcrutil-x86_LIBS.win    += \
    116         $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt-x86$(VBOX_SUFF_LIB) \
    117         $(VBOX_PATH_ADDITIONS_LIB)/VBoxCrHgsmi-x86$(VBOX_SUFF_LIB)
    118 endif
    119 VBoxOGLcrutil-x86_DEFS = $(VBoxOGLcrutil_DEFS) VBOX_WDDM_WOW64
    120 ifdef VBOX_WITH_WDDM
    121 # CR_DEBUG_BACKDOOR_ENABLE define is inherited from VBoxOGLcrutil
    122 VBoxOGLcrutil-x86_INCS.win    += $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm
    123 VBoxOGLcrutil-x86_LIBS.win    += $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB)
    124 endif
    125 # vc7 hangs during compilation of this file when optimizations are enabled.
    126 #VBoxOGLcrutil-x86_pixel.c_CFLAGS += -Od
    127 #VBoxOGLcrutil-x86_pixel.c_CFLAGS += -Od
    128 endif
    129 
    130 #
    131 # Generate files for VBoxOGLcrutil.
    132 #
    133 ifdef VBOX_WITH_CRDUMPER
    134 $(VBOX_PATH_CROGL_GENFILES)/dump_gen.cpp: $(PATH_SUB_CURRENT)/state_tracker/dump_gen.py $(PATH_ROOT)/src/VBox/HostServices/SharedOpenGL/crserverlib/get_sizes.py $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_isenabled.txt state_extensions_isenabled.txt) $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    135         $(call MSG_GENERATE,python,$@,$<)
    136         $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI) $(<D)
     36 LIBRARIES += VBoxOGLcrpacker VBoxOGLcrstate
    13737endif
    13838
     
    243143        $(call MSG_GENERATE,python,$@,$<)
    244144        $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
    245 
    246 #
    247 # VBoxOGLspuload
    248 #
    249 VBoxOGLspuload_TEMPLATE = VBOXCROGLR3GUESTLIB
    250 VBoxOGLspuload_INTERMEDIATES = \
    251         $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h
    252 VBoxOGLspuload_INCS += \
    253         $(VBOX_GRAPHICS_INCS)
    254 if1of ($(KBUILD_TARGET), linux solaris freebsd)
    255  VBoxOGLspuload_INCS += \
    256         $(VBOX_GL_INCS)
    257 endif
    258 VBoxOGLspuload_SOURCES = \
    259         spu_loader/spuinit.c \
    260         spu_loader/spuload.c \
    261         spu_loader/choosevisual.c \
    262         $(VBOX_PATH_CROGL_GENFILES)/spuchange.c \
    263         $(VBOX_PATH_CROGL_GENFILES)/spucopy.c \
    264         $(VBOX_PATH_CROGL_GENFILES)/dispatch.c \
    265         $(VBOX_PATH_CROGL_GENFILES)/glloader.c
    266 VBoxOGLspuload_CLEAN = \
    267         $(VBOX_PATH_CROGL_GENFILES)/spuchange.c \
    268         $(VBOX_PATH_CROGL_GENFILES)/spucopy.c \
    269         $(VBOX_PATH_CROGL_GENFILES)/dispatch.c \
    270         $(VBOX_PATH_CROGL_GENFILES)/glloader.c \
    271         $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h
    272 ifdef VBOX_WITH_CRHGSMI
    273 VBoxOGLspuload_DEFS.win    += VBOX_WITH_CRHGSMI
    274 endif
    275 ifdef VBOX_WITH_WDDM
    276 VBoxOGLspuload_DEFS.win   += VBOX_WITH_WDDM
    277 endif
    278 
    279 if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
    280 #
    281 # VBoxOGLspuload-x86 - x86 VBoxOGLspuload version built for amd64 build
    282 #
    283 LIBRARIES.win.amd64 += VBoxOGLspuload-x86
    284 VBoxOGLspuload-x86_TEMPLATE = VBOXCROGLR3GUESTLIB
    285 VBoxOGLspuload-x86_EXTENDS = VBoxOGLspuload
    286 VBoxOGLspuload-x86_BLD_TRG_ARCH = x86
    287 VBoxOGLspuload-x86_DEFS = $(VBoxOGLspuload_DEFS) VBOX_WDDM_WOW64
    288 endif
    289 
    290 
    291 #
    292 # Generate files for VBoxOGLspuload.
    293 #
    294 $(VBOX_PATH_CROGL_GENFILES)/dispatch.c: $(PATH_SUB_CURRENT)/spu_loader/dispatch.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    295         $(call MSG_GENERATE,python,$@,$<)
    296         $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
    297 
    298 $(VBOX_PATH_CROGL_GENFILES)/spucopy.c: $(PATH_SUB_CURRENT)/spu_loader/spucopy.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    299         $(call MSG_GENERATE,python,$@,$<)
    300         $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
    301 
    302 $(VBOX_PATH_CROGL_GENFILES)/spuchange.c: $(PATH_SUB_CURRENT)/spu_loader/spuchange.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    303         $(call MSG_GENERATE,python,$@,$<)
    304         $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
    305 
    306 $(VBOX_PATH_CROGL_GENFILES)/glloader.c: $(PATH_SUB_CURRENT)/spu_loader/glloader.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    307         $(call MSG_GENERATE,python,$@,$<)
    308         $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
    309 
    310 $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h: $(PATH_SUB_CURRENT)/spu_loader/dispatchheader.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)
    311         $(call MSG_GENERATE,python,$@,$<)
    312         $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
    313145
    314146
     
    495327
    496328
    497 #
    498 # VBoxOGLerrorspu
    499 # @remark See HostServices/OpenGL/Makefile for and explanation of the gl.h
    500 #         and glu.h intermediate files on darwin.
    501 #
    502 VBoxOGLerrorspu_TEMPLATE = VBOXCROGLR3GUESTLIB
    503 VBoxOGLerrorspu_INTERMEDIATES = \
    504         $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h
    505 VBoxOGLerrorspu_INCS += \
    506         $(VBOX_GRAPHICS_INCS)
    507 if1of ($(KBUILD_TARGET), linux solaris freebsd)
    508  VBoxOGLerrorspu_INCS += \
    509         $(VBOX_GL_INCS)
    510 endif
    511 VBoxOGLerrorspu_SOURCES = \
    512         $(VBOX_PATH_CROGL_GENFILES)/errorspu.c \
    513         error/errorspu_init.c
    514 VBoxOGLerrorspu_CLEAN = \
    515         $(VBOX_PATH_CROGL_GENFILES)/errorspu.c
    516 ifdef VBOX_WITH_CRHGSMI
    517 VBoxOGLerrorspu_DEFS.win    += VBOX_WITH_CRHGSMI
    518 endif
    519 ifdef VBOX_WITH_WDDM
    520 VBoxOGLerrorspu_DEFS.win   += VBOX_WITH_WDDM
    521 endif
    522 
    523 
    524 if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)
    525 #
    526 # VBoxOGLerrorspu-x86 - x86 VBoxOGLerrorspu version built for amd64 build
    527 #
    528 LIBRARIES.win.amd64 += VBoxOGLerrorspu-x86
    529 VBoxOGLerrorspu-x86_TEMPLATE = VBOXCROGLR3GUESTLIB
    530 VBoxOGLerrorspu-x86_EXTENDS = VBoxOGLerrorspu
    531 VBoxOGLerrorspu-x86_BLD_TRG_ARCH = x86
    532 VBoxOGLerrorspu-x86_DEFS = $(VBoxOGLerrorspu_DEFS) VBOX_WDDM_WOW64
    533 endif
    534 
    535 #
    536 # Generate files for VBoxOGLerrorspu.
    537 #
    538 $(VBOX_PATH_CROGL_GENFILES)/errorspu.c: $(PATH_SUB_CURRENT)/error/error.py $(VBOX_CROGL_API_FILES)
    539         $(call MSG_GENERATE,python,$@,$<)
    540         $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
     329
    541330include $(FILE_KBUILD_SUB_FOOTER)
    542331
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