Changeset 75635 in vbox for trunk/src/VBox/Additions/3D
- Timestamp:
- Nov 21, 2018 10:29:49 AM (6 years ago)
- Location:
- trunk/src/VBox/Additions/3D
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/3D/Config.kmk
r75456 r75635 20 20 # Include the top-level configure file. 21 21 ifndef VBOX_ROOT_CONFIG_KMK_INCLUDED 22 22 include $(PATH_ROOT)/Config.kmk 23 23 endif 24 24 … … 32 32 # Base template for Mesa3D code and code which uses Mesa3D libraries. 33 33 # 34 TEMPLATE_VB OXMESA3DGUESTR3DLL= VBox Mesa 3D Guest User Mode DLL35 TEMPLATE_VB OXMESA3DGUESTR3DLL_EXTENDS= NewerVccVBoxGuestR3Dll36 TEMPLATE_VB OXMESA3DGUESTR3DLL_INST= $(INST_ADDITIONS)37 TEMPLATE_VB OXMESA3DGUESTR3DLL_DEFS= $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS) \34 TEMPLATE_VBoxMesa3DGuestR3Dll = VBox Mesa 3D Guest User Mode DLL 35 TEMPLATE_VBoxMesa3DGuestR3Dll_EXTENDS = NewerVccVBoxGuestR3Dll 36 TEMPLATE_VBoxMesa3DGuestR3Dll_INST = $(INST_ADDITIONS) 37 TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS = $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS) \ 38 38 VBOX_WITH_MESA3D 39 TEMPLATE_VB OXMESA3DGUESTR3DLL_SDKS.win= $(TEMPLATE_NewerVccVBoxGuestR3Dll_SDKS) \39 TEMPLATE_VBoxMesa3DGuestR3Dll_SDKS.win = $(TEMPLATE_NewerVccVBoxGuestR3Dll_SDKS) \ 40 40 $(VBOX_WINDDK_GST_W8) 41 42 41 # VirtualBox specific modifications of the Mesa3D code. 43 42 # All modified places can be found by searching for VBOX … … 60 59 # VBOX_WITH_MESA3D_SVGA_INSTANCING Instancing for DrawPrimitives in the Gallium SVGA driver 61 60 # (VGPU9 only, VGPU10 has it). 62 TEMPLATE_VB OXMESA3DGUESTR3DLL_DEFS+= \61 TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS += \ 63 62 VBOX_WITH_MESA3D_COMPILE \ 64 63 VBOX_WITH_MESA3D_D3D_FROM_SYSTEMMEM \ … … 71 70 VBOX_WITH_MESA3D_SVGA_HALFZ \ 72 71 VBOX_WITH_MESA3D_SVGA_INSTANCING 73 74 TEMPLATE_VBOXMESA3DGUESTR3DLL_DEFS.win = $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS.win) \ 72 TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS.win = $(TEMPLATE_NewerVccVBoxGuestR3Dll_DEFS.win) \ 75 73 _USE_MATH_DEFINES \ 76 74 WINAPI=__stdcall \ 77 75 _WIN32 78 79 TEMPLATE_VBOXMESA3DGUESTR3DLL_INCS = $(TEMPLATE_NewerVccVBoxGuestR3Dll_INCS) \ 76 TEMPLATE_VBoxMesa3DGuestR3Dll_INCS = $(TEMPLATE_NewerVccVBoxGuestR3Dll_INCS) \ 80 77 $(VBOX_PATH_MESA)/include \ 81 78 $(VBOX_PATH_MESA)/include/c99 \ … … 87 84 88 85 # 89 # Variant of VB OXMESA3DGUESTR3DLLthat requires Windows Vista or later.86 # Variant of VBoxMesa3DGuestR3Dll that requires Windows Vista or later. 90 87 # 91 TEMPLATE_VB OXMESA3DGUESTR3DLLMinVista= VBox Mesa 3D Guest User Mode DLL (Windows Vista or newer)92 TEMPLATE_VB OXMESA3DGUESTR3DLLMinVista_EXTENDS = VBOXMESA3DGUESTR3DLL88 TEMPLATE_VBoxMesa3DGuestR3DllMinVista = VBox Mesa 3D Guest User Mode DLL (Windows Vista or newer) 89 TEMPLATE_VBoxMesa3DGuestR3DllMinVista_EXTENDS = VBoxMesa3DGuestR3Dll 93 90 ifeq ($(KBUILD_TARGET),win) 94 TEMPLATE_VBOXMESA3DGUESTR3DLLMinVista_LDFLAGS.win.x86 = $(filter-out -Section:.bss$(COMMA)RW!K,$(TEMPLATE_VBOXMESA3DGUESTR3DLL_LDFLAGS.win.x86))95 TEMPLATE_VBOXMESA3DGUESTR3DLLMinVista_POST_CMDS.win.x86 = $(subst $(VBOX_PE_SET_VERSION), $(VBOX_PE_SET_VERSION) --vista,$(TEMPLATE_VBOXMESA3DGUESTR3DLL_POST_CMDS.win.x86))96 TEMPLATE_VBOXMESA3DGUESTR3DLLMinVista_POST_CMDS.win.amd64 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) --vista $(out)$$(NLTAB)$(TEMPLATE_VBOXMESA3DGUESTR3DLL_POST_CMDS.win.amd64))97 TEMPLATE_VBOXMESA3DGUESTR3DLLMinVista_LNK_DEPS.win.amd64 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION)) $(TEMPLATE_VBOXMESA3DGUESTR3DLL_LNK_DEPS.win.amd64)91 TEMPLATE_VBoxMesa3DGuestR3DllMinVista_LDFLAGS.win.x86 = $(filter-out -Section:.bss$(COMMA)RW!K,$(TEMPLATE_VBoxMesa3DGuestR3Dll_LDFLAGS.win.x86)) 92 TEMPLATE_VBoxMesa3DGuestR3DllMinVista_POST_CMDS.win.x86 = $(subst $(VBOX_PE_SET_VERSION), $(VBOX_PE_SET_VERSION) --vista,$(TEMPLATE_VBoxMesa3DGuestR3Dll_POST_CMDS.win.x86)) 93 TEMPLATE_VBoxMesa3DGuestR3DllMinVista_POST_CMDS.win.amd64 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) --vista $(out)$$(NLTAB)$(TEMPLATE_VBoxMesa3DGuestR3Dll_POST_CMDS.win.amd64)) 94 TEMPLATE_VBoxMesa3DGuestR3DllMinVista_LNK_DEPS.win.amd64 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION)) $(TEMPLATE_VBoxMesa3DGuestR3Dll_LNK_DEPS.win.amd64) 98 95 endif 96 -
trunk/src/VBox/Additions/3D/Makefile.kmk
r75443 r75635 23 23 # 24 24 ifndef VBOX_MESA3D_CONFIG_KMK_INCLUDED 25 25 include $(PATH_SUB_CURRENT)/Config.kmk 26 26 endif 27 27 … … 31 31 include $(PATH_SUB_CURRENT)/mesa/Makefile.kmk 32 32 if1of ($(KBUILD_TARGET), win) 33 33 include $(PATH_SUB_CURRENT)/win/Makefile.kmk 34 34 endif 35 35 -
trunk/src/VBox/Additions/3D/mesa/Makefile.kmk
r75456 r75635 22 22 # Target lists. 23 23 # 24 #VBOX_PATH_MESA_GENFILES = $(PATH_OBJ)/VBoxMesaGen 25 #BLDDIRS += \ 26 # $(VBOX_PATH_MESA_GENFILES)/ 27 28 if1of ($(KBUILD_TARGET), win) 29 LIBRARIES += \ 24 LIBRARIES.win += \ 30 25 VBoxMesaUtilLib \ 31 26 VBoxMesaLib \ … … 35 30 VBoxMesaSVGALib \ 36 31 VBoxMesaSVGAWinsysLib 37 32 LIBRARIES.win.amd64 += \ 38 33 VBoxMesaUtilLib-x86 \ 39 34 VBoxMesaLib-x86 \ … … 43 38 VBoxMesaSVGALib-x86 \ 44 39 VBoxMesaSVGAWinsysLib-x86 45 endif 46 47 48 TEMPLATE_VBOXMESA3DGUESTR3LIB = VBox Mesa 3D Guest User Mode Library 49 TEMPLATE_VBOXMESA3DGUESTR3LIB_EXTENDS = VBOXMESA3DGUESTR3DLL 50 TEMPLATE_VBOXMESA3DGUESTR3LIB_INST = $(INST_ADDITIONS_LIB) 40 41 42 TEMPLATE_VBoxMesa3DGuestR3Lib = VBox Mesa 3D Guest User Mode Library 43 TEMPLATE_VBoxMesa3DGuestR3Lib_EXTENDS = VBoxMesa3DGuestR3Dll 44 TEMPLATE_VBoxMesa3DGuestR3Lib_INST = $(INST_ADDITIONS_LIB) 51 45 ifeq ($(KBUILD_TARGET),win) 52 46 # Do not treat warnings as errors, because Mesa code produces too many warnings with MSC. 53 TEMPLATE_VBOXMESA3DGUESTR3LIB_CFLAGS = $(filter-out -WX,$(TEMPLATE_VBOXMESA3DGUESTR3DLL_CFLAGS))54 TEMPLATE_VBOXMESA3DGUESTR3LIB_CXXFLAGS = $(filter-out -WX,$(TEMPLATE_VBOXMESA3DGUESTR3DLL_CXXFLAGS))47 TEMPLATE_VBoxMesa3DGuestR3Lib_CFLAGS = $(filter-out -WX,$(TEMPLATE_VBoxMesa3DGuestR3Dll_CFLAGS)) 48 TEMPLATE_VBoxMesa3DGuestR3Lib_CXXFLAGS = $(filter-out -WX,$(TEMPLATE_VBoxMesa3DGuestR3Dll_CXXFLAGS)) 55 49 # -wd4005: vcc120: '__useHeader' : macro redefinition 56 50 # -wd4013: undefined; assuming extern returning int … … 99 93 # -wd4805: '|=' : unsafe mix of type 'GLboolean' and type 'bool' in operation 100 94 # -wd4918: 'y' : invalid character in pragma optimization list 101 VBOXMESA3DGUESTR3LIB_DISABLED_WARNINGS = \ 102 -wd4005 -wd4013 -wd4018 -wd4054 -wd4057 -wd4090 -wd4098 -wd4099 -wd4100 -wd4101 -wd4130 -wd4132 -wd4146 -wd4152 -wd4189 \ 103 -wd4200 -wd4204 -wd4206 -wd4211 -wd4221 -wd4245 -wd4255 -wd4258 -wd4265 -wd4267 -wd4266 -wd4287 -wd4291 -wd4305 -wd4306 -wd4310 -wd4311 -wd4351 -wd4355 -wd4388 \ 104 -wd4389 -wd4640 -wd4668 -wd4700 -wd4701 -wd4702 -wd4703 -wd4756 -wd4800 -wd4805 -wd4918 105 TEMPLATE_VBOXMESA3DGUESTR3LIB_CFLAGS.win += $(VBOXMESA3DGUESTR3LIB_DISABLED_WARNINGS) 106 TEMPLATE_VBOXMESA3DGUESTR3LIB_CXXFLAGS.win += $(VBOXMESA3DGUESTR3LIB_DISABLED_WARNINGS) 95 VBOX_MESA3D_VCC_DISABLED_WARNINGS = \ 96 -wd4005 -wd4013 -wd4018 -wd4054 -wd4057 -wd4090 -wd4098 -wd4099 -wd4100 -wd4101 -wd4130 -wd4132 -wd4146 \ 97 -wd4152 -wd4189 -wd4200 -wd4204 -wd4206 -wd4211 -wd4221 -wd4245 -wd4255 -wd4258 -wd4265 -wd4267 -wd4266 \ 98 -wd4287 -wd4291 -wd4305 -wd4306 -wd4310 -wd4311 -wd4351 -wd4355 -wd4388 -wd4389 -wd4640 -wd4668 -wd4700 \ 99 -wd4701 -wd4702 -wd4703 -wd4756 -wd4800 -wd4805 -wd4918 100 TEMPLATE_VBoxMesa3DGuestR3Lib_CFLAGS.win += $(VBOX_MESA3D_VCC_DISABLED_WARNINGS) 101 TEMPLATE_VBoxMesa3DGuestR3Lib_CXXFLAGS.win += $(VBOX_MESA3D_VCC_DISABLED_WARNINGS) 107 102 endif 108 TEMPLATE_VBOXMESA3DGUESTR3LIB_INCS = include \ 103 TEMPLATE_VBoxMesa3DGuestR3Lib_INCS = \ 104 include \ 109 105 $(VBOX_MESA)/include/GL \ 110 106 $(VBOX_MESA)/src/mapi \ … … 114 110 $(VBOX_MESA)/src/compiler/nir \ 115 111 $(VBOX_MESA)/src/gallium/state_trackers/wgl \ 116 $(TEMPLATE_VBOXMESA3DGUESTR3DLL_INCS) 117 TEMPLATE_VBOXMESA3DGUESTR3LIB_DEFS = $(TEMPLATE_VBOXMESA3DGUESTR3DLL_DEFS) \ 112 $(TEMPLATE_VBoxMesa3DGuestR3Dll_INCS) 113 TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS = \ 114 $(TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS) \ 118 115 PACKAGE_VERSION=\"$(VBOX_MESA)\" \ 119 116 PACKAGE_BUGREPORT=\"$(VBOX_MESA)\" 120 117 # For wgl, glapi and mesa 121 TEMPLATE_VB OXMESA3DGUESTR3LIB_DEFS+= \118 TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS += \ 122 119 MAPI_MODE_UTIL _GDI32_ BUILD_GL32 KHRONOS_DLL_EXPORTS GL_API=GLAPI GL_APIENTRY=GLAPIENTRY _GLAPI_NO_EXPORTS 123 TEMPLATE_VBOXMESA3DGUESTR3LIB_DEFS.release = $(TEMPLATE_VBOXMESA3DGUESTR3DLL_DEFS.release) \ 120 TEMPLATE_VBoxMesa3DGuestR3Lib_DEFS.release = \ 121 $(TEMPLATE_VBoxMesa3DGuestR3Dll_DEFS.release) \ 124 122 NDEBUG 125 123 … … 128 126 # VBoxMesaUtilLib 129 127 # 130 VBoxMesaUtilLib_TEMPLATE = VBOXMESA3DGUESTR3LIB131 VBoxMesaUtilLib_SOURCES 128 VBoxMesaUtilLib_TEMPLATE = VBoxMesa3DGuestR3Lib 129 VBoxMesaUtilLib_SOURCES = \ 132 130 $(VBOX_MESA)/src/util/bitscan.c \ 133 131 $(VBOX_MESA)/src/util/build_id.c \ … … 150 148 $(VBOX_MESA)/src/util/u_queue.c \ 151 149 $(VBOX_MESA)/src/util/u_vector.c 152 153 150 # Auto-generated 154 VBoxMesaUtilLib_SOURCES 151 VBoxMesaUtilLib_SOURCES += \ 155 152 $(VBOX_MESA)/src/util/format_srgb.c 156 153 157 154 # 32 bit lib for 64 bit build 158 VBoxMesaUtilLib-x86_EXTENDS = VBoxMesaUtilLib155 VBoxMesaUtilLib-x86_EXTENDS = VBoxMesaUtilLib 159 156 VBoxMesaUtilLib-x86_BLD_TRG_ARCH = x86 160 157 … … 163 160 # VBoxMesaLib 164 161 # 165 VBoxMesaLib_TEMPLATE = VBOXMESA3DGUESTR3LIB166 VBoxMesaLib_SOURCES += \162 VBoxMesaLib_TEMPLATE = VBoxMesa3DGuestR3Lib 163 VBoxMesaLib_SOURCES = \ 167 164 $(VBOX_MESA)/src/mesa/state_tracker/st_atifs_to_tgsi.c \ 168 165 $(VBOX_MESA)/src/mesa/state_tracker/st_atom_array.c \ … … 239 236 $(VBOX_MESA)/src/mesa/state_tracker/st_tgsi_lower_yuv.c \ 240 237 $(VBOX_MESA)/src/mesa/state_tracker/st_vdpau.c 241 VBoxMesaLib_SOURCES 238 VBoxMesaLib_SOURCES += \ 242 239 $(VBOX_MESA)/src/mesa/program/arbprogparse.c \ 243 240 $(VBOX_MESA)/src/mesa/program/ir_to_mesa.cpp \ … … 258 255 $(VBOX_MESA)/src/mesa/program/prog_statevars.c \ 259 256 $(VBOX_MESA)/src/mesa/program/symbol_table.c 260 VBoxMesaLib_SOURCES 257 VBoxMesaLib_SOURCES += \ 261 258 $(VBOX_MESA)/src/mesa/main/accum.c \ 262 259 $(VBOX_MESA)/src/mesa/main/api_arrayelt.c \ … … 385 382 $(VBOX_MESA)/src/mesa/main/vtxfmt.c \ 386 383 $(VBOX_MESA)/src/mesa/main/es1_conversion.c 387 VBoxMesaLib_SOURCES 384 VBoxMesaLib_SOURCES += \ 388 385 $(VBOX_MESA)/src/mesa/math/m_debug_clip.c \ 389 386 $(VBOX_MESA)/src/mesa/math/m_debug_norm.c \ … … 393 390 $(VBOX_MESA)/src/mesa/math/m_translate.c \ 394 391 $(VBOX_MESA)/src/mesa/math/m_vector.c 395 VBoxMesaLib_SOURCES 392 VBoxMesaLib_SOURCES += \ 396 393 $(VBOX_MESA)/src/mesa/vbo/vbo_context.c \ 397 394 $(VBOX_MESA)/src/mesa/vbo/vbo_exec_api.c \ … … 411 408 $(VBOX_MESA)/src/mesa/vbo/vbo_split_copy.c \ 412 409 $(VBOX_MESA)/src/mesa/vbo/vbo_split_inplace.c 413 VBoxMesaLib_SOURCES 410 VBoxMesaLib_SOURCES += \ 414 411 $(VBOX_MESA)/src/compiler/blob.c \ 415 412 $(VBOX_MESA)/src/compiler/glsl_types.cpp \ … … 612 609 $(VBOX_MESA)/src/compiler/nir/nir_validate.c \ 613 610 $(VBOX_MESA)/src/compiler/nir/nir_worklist.c 614 VBoxMesaLib_SOURCES 611 VBoxMesaLib_SOURCES += \ 615 612 $(VBOX_MESA)/src/mapi/glapi/glapi_dispatch.c \ 616 613 $(VBOX_MESA)/src/mapi/glapi/glapi_entrypoint.c \ … … 620 617 $(VBOX_MESA)/src/mapi/u_current.c \ 621 618 $(VBOX_MESA)/src/mapi/u_execmem.c 619 # Not used 620 # $(VBOX_MESA)/src/compiler/glsl/standalone_scaffolding.cpp 621 # $(VBOX_MESA)/src/compiler/glsl/standalone.cpp 622 622 623 623 # Disable optimization for some files, because it takes over 2 minutes to compile them with MSC otherwise. … … 626 626 $(VBOX_MESA)/src/mesa/main/mipmap.c_CFLAGS.release += -Od 627 627 628 # Not used629 # $(VBOX_MESA)/src/compiler/glsl/standalone_scaffolding.cpp630 # $(VBOX_MESA)/src/compiler/glsl/standalone.cpp631 632 628 # 32 bit lib for 64 bit build 633 VBoxMesaLib-x86_EXTENDS = VBoxMesaLib629 VBoxMesaLib-x86_EXTENDS = VBoxMesaLib 634 630 VBoxMesaLib-x86_BLD_TRG_ARCH = x86 635 631 … … 638 634 # VBoxMesaWglLib 639 635 # 640 VBoxMesaWglLib_TEMPLATE = VBOXMESA3DGUESTR3LIB641 VBoxMesaWglLib_SOURCES 636 VBoxMesaWglLib_TEMPLATE = VBoxMesa3DGuestR3Lib 637 VBoxMesaWglLib_SOURCES = \ 642 638 $(VBOX_MESA)/src/gallium/state_trackers/wgl/stw_context.c \ 643 639 $(VBOX_MESA)/src/gallium/state_trackers/wgl/stw_device.c \ … … 657 653 658 654 # 32 bit lib for 64 bit build 659 VBoxMesaWglLib-x86_EXTENDS = VBoxMesaWglLib655 VBoxMesaWglLib-x86_EXTENDS = VBoxMesaWglLib 660 656 VBoxMesaWglLib-x86_BLD_TRG_ARCH = x86 661 657 … … 664 660 # VBoxMesaGalliumAuxLib 665 661 # 666 VBoxMesaGalliumAuxLib_TEMPLATE = VBOXMESA3DGUESTR3LIB667 VBoxMesaGalliumAuxLib_SOURCES 662 VBoxMesaGalliumAuxLib_TEMPLATE = VBoxMesa3DGuestR3Lib 663 VBoxMesaGalliumAuxLib_SOURCES = \ 668 664 $(VBOX_MESA)/src/gallium/auxiliary/cso_cache/cso_cache.c \ 669 665 $(VBOX_MESA)/src/gallium/auxiliary/cso_cache/cso_context.c \ … … 818 814 $(VBOX_MESA)/src/gallium/auxiliary/util/u_upload_mgr.c \ 819 815 $(VBOX_MESA)/src/gallium/auxiliary/util/u_vbuf.c 820 821 816 # Auto-generated 822 VBoxMesaGalliumAuxLib_SOURCES 817 VBoxMesaGalliumAuxLib_SOURCES += \ 823 818 $(VBOX_MESA)/src/gallium/auxiliary/indices/u_indices_gen.c \ 824 819 $(VBOX_MESA)/src/gallium/auxiliary/indices/u_unfilled_gen.c \ … … 826 821 827 822 # 32 bit lib for 64 bit build 828 VBoxMesaGalliumAuxLib-x86_EXTENDS = VBoxMesaGalliumAuxLib823 VBoxMesaGalliumAuxLib-x86_EXTENDS = VBoxMesaGalliumAuxLib 829 824 VBoxMesaGalliumAuxLib-x86_BLD_TRG_ARCH = x86 830 825 … … 833 828 # VBoxMesaNineLib 834 829 # 835 VBoxMesaNineLib_TEMPLATE = VBOXMESA3DGUESTR3LIB 836 VBoxMesaNineLib_INCS += $(VBOX_MESA)/include/D3D9 837 VBoxMesaNineLib_DEFS.win += COBJMACROS INC_OLE2 830 VBoxMesaNineLib_TEMPLATE = VBoxMesa3DGuestR3Lib 831 VBoxMesaNineLib_INCS = \ 832 $(VBOX_MESA)/include/D3D9 833 VBoxMesaNineLib_DEFS.win = COBJMACROS INC_OLE2 838 834 # -wd4028: formal parameter 4 different from declaration 839 835 # 'nine_context_set_vertex_shader_constant_f' parameter is declared 'const unsigned pConstantData_size' 840 836 # but autogenerated code produces 'unsigned pConstantData_size'. 841 VBoxMesaNineLib_CFLAGS.win += -wd4028842 VBoxMesaNineLib_SOURCES 837 VBoxMesaNineLib_CFLAGS.win = -wd4028 838 VBoxMesaNineLib_SOURCES = \ 843 839 $(VBOX_MESA)/src/gallium/state_trackers/nine/adapter9.c \ 844 840 $(VBOX_MESA)/src/gallium/state_trackers/nine/authenticatedchannel9.c \ … … 880 876 $(VBOX_MESA)/src/gallium/state_trackers/nine/volumetexture9.c 881 877 882 #VBOX_MESA_PYTHON_ENV = $(REDIRECT) $(if $1,-E 'PYTHONPATH=$1',) $(if $2,-o $2,) -0 $(if $3,$3,/dev/null) --883 #884 ## for u_format.h885 #VBoxMesaNineLib_INCS += ./$(VBOX_MESA)/src/gallium/auxiliary/util886 #887 #VBoxMesaNineLib_SOURCES += \888 # $(VBOX_PATH_MESA_GENFILES)/u_indices_gen.c \889 # $(VBOX_PATH_MESA_GENFILES)/u_format_table.c \890 # $(VBOX_PATH_MESA_GENFILES)/u_unfilled_gen.c891 #892 #$(VBOX_PATH_MESA_GENFILES)/u_indices_gen.c: \893 # $(addprefix $(PATH_SUB_CURRENT)/$(VBOX_MESA)/src/gallium/auxiliary/indices/, u_indices_gen.py) \894 # | $$(dir $$@)895 # $(call MSG_GENERATE,python,$@,$<)896 # $(QUIET)$(call VBOX_MESA_PYTHON_ENV,$(VBOX_PATH_MESA_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<897 #898 #$(VBOX_PATH_MESA_GENFILES)/u_unfilled_gen.c: \899 # $(addprefix $(PATH_SUB_CURRENT)/$(VBOX_MESA)/src/gallium/auxiliary/indices/, u_unfilled_gen.py) \900 # | $$(dir $$@)901 # $(call MSG_GENERATE,python,$@,$<)902 # $(QUIET)$(call VBOX_MESA_PYTHON_ENV,$(VBOX_PATH_MESA_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<903 #904 #$(VBOX_PATH_MESA_GENFILES)/u_format_table.c: \905 # $(addprefix $(PATH_SUB_CURRENT)/$(VBOX_MESA)/src/gallium/auxiliary/util/, u_format_table.py u_format.csv) \906 # | $$(dir $$@)907 # $(call MSG_GENERATE,python,$@,$<)908 # $(QUIET)$(call VBOX_MESA_PYTHON_ENV,$(VBOX_PATH_MESA_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(PATH_SUB_CURRENT)/$(VBOX_MESA)/src/gallium/auxiliary/util/u_format.csv909 910 878 # 32 bit lib for 64 bit build 911 VBoxMesaNineLib-x86_EXTENDS = VBoxMesaNineLib879 VBoxMesaNineLib-x86_EXTENDS = VBoxMesaNineLib 912 880 VBoxMesaNineLib-x86_BLD_TRG_ARCH = x86 913 881 … … 916 884 # VBoxMesaSVGALib 917 885 # 918 VBoxMesaSVGALib_TEMPLATE = VBOXMESA3DGUESTR3LIB 919 VBoxMesaSVGALib_INCS += $(VBOX_MESA)/src/gallium/drivers/svga/include 920 VBoxMesaSVGALib_SOURCES = \ 886 VBoxMesaSVGALib_TEMPLATE = VBoxMesa3DGuestR3Lib 887 VBoxMesaSVGALib_INCS = \ 888 $(VBOX_MESA)/src/gallium/drivers/svga/include 889 VBoxMesaSVGALib_SOURCES = \ 921 890 $(VBOX_MESA)/src/gallium/drivers/svga/svga_cmd.c \ 922 891 $(VBOX_MESA)/src/gallium/drivers/svga/svga_cmd_vgpu10.c \ … … 977 946 978 947 # 32 bit lib for 64 bit build 979 VBoxMesaSVGALib-x86_EXTENDS = VBoxMesaSVGALib948 VBoxMesaSVGALib-x86_EXTENDS = VBoxMesaSVGALib 980 949 VBoxMesaSVGALib-x86_BLD_TRG_ARCH = x86 981 950 … … 984 953 # VBoxMesaSVGAWinsysLib 985 954 # 986 VBoxMesaSVGAWinsysLib_TEMPLATE = VBOXMESA3DGUESTR3LIB987 VBoxMesaSVGAWinsysLib_INCS 955 VBoxMesaSVGAWinsysLib_TEMPLATE = VBoxMesa3DGuestR3Lib 956 VBoxMesaSVGAWinsysLib_INCS += \ 988 957 $(VBOX_MESA)/src/gallium/drivers/svga/include \ 989 958 $(VBOX_MESA)/src/gallium/drivers/svga 990 VBoxMesaSVGAWinsysLib_SOURCES 959 VBoxMesaSVGAWinsysLib_SOURCES = \ 991 960 $(VBOX_MESA)/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c \ 992 961 $(VBOX_MESA)/src/gallium/winsys/svga/drm/vmw_buffer.c \ … … 1000 969 1001 970 # These will be reimplemented for WDDM 1002 #VBoxMesaSVGAWinsysLib_SOURCES 971 #VBoxMesaSVGAWinsysLib_SOURCES += \ 1003 972 # $(VBOX_MESA)/src/gallium/winsys/svga/drm/vmw_screen.c \ 1004 973 # $(VBOX_MESA)/src/gallium/winsys/svga/drm/vmw_screen_dri.c \ … … 1006 975 1007 976 # 32 bit lib for 64 bit build 1008 VBoxMesaSVGAWinsysLib-x86_EXTENDS = VBoxMesaSVGAWinsysLib977 VBoxMesaSVGAWinsysLib-x86_EXTENDS = VBoxMesaSVGAWinsysLib 1009 978 VBoxMesaSVGAWinsysLib-x86_BLD_TRG_ARCH = x86 1010 979 1011 980 1012 981 include $(FILE_KBUILD_SUB_FOOTER) 982 -
trunk/src/VBox/Additions/3D/win/Makefile.kmk
r75562 r75635 5 5 6 6 # 7 # Copyright (C) 2016-201 7Oracle Corporation7 # Copyright (C) 2016-2018 Oracle Corporation 8 8 # 9 9 # This file is part of VirtualBox Open Source Edition (OSE), as … … 27 27 28 28 include $(FILE_KBUILD_SUB_FOOTER) 29 -
trunk/src/VBox/Additions/3D/win/VBoxGL/Makefile.kmk
r75443 r75635 22 22 #VBOX_WITH_MESA3D_GL_SOFTWARE = 1 23 23 24 DLLS += VBoxGL 25 VBoxGL_TEMPLATE = VBOXMESA3DGUESTR3DLLMinVista 26 # -wd4005: '__useHeader' : redefinition 27 VBoxGL_CFLAGS = -wd4005 24 DLLS += VBoxGL 25 DLLS.amd64 += VBoxGL-x86 28 26 29 VBoxGL_INCS += \ 27 VBoxGL_TEMPLATE = VBoxMesa3DGuestR3DllMinVista 28 # -wd4005: '__useHeader' : redefinition 29 VBoxGL_CFLAGS = -wd4005 30 VBoxGL_INCS = \ 30 31 $(VBOX_PATH_3D)/win/include \ 31 32 $(VBOX_PATH_MESA)/include/GL \ … … 37 38 $(VBOX_PATH_VMSVGA_INC) \ 38 39 $(VBOX_GRAPHICS_INCS) 39 40 VBoxGL_SOURCES = \ 40 VBoxGL_SOURCES = \ 41 41 $(VBOX_PATH_MESA)/src/gallium/state_trackers/wgl/opengl32.def \ 42 42 VBoxGL.rc 43 44 43 ifndef VBOX_WITH_MESA3D_GL_SOFTWARE 45 VBoxGL_SOURCES 44 VBoxGL_SOURCES += \ 46 45 GaDrvEnvKMT.cpp \ 47 46 VBoxGL.c 48 47 else 49 VBoxGL_SOURCES 48 VBoxGL_SOURCES += \ 50 49 $(VBOX_PATH_MESA)/src/gallium/targets/libgl-gdi/libgl_gdi.c 51 VBoxGL_SOURCES 50 VBoxGL_SOURCES += \ 52 51 $(VBOX_PATH_MESA)/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c 53 VBoxGL_SOURCES 52 VBoxGL_SOURCES += \ 54 53 $(VBOX_PATH_MESA)/src/gallium/drivers/softpipe/sp_buffer.c \ 55 54 $(VBOX_PATH_MESA)/src/gallium/drivers/softpipe/sp_clear.c \ … … 86 85 $(VBOX_PATH_MESA)/src/gallium/drivers/softpipe/sp_tile_cache.c 87 86 endif 88 89 VBoxGL_LIBS = \ 87 VBoxGL_LIBS = \ 90 88 $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB) \ 91 89 $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib$(VBOX_SUFF_LIB) \ … … 102 100 # VBoxGL-x86 - x86 version of VBoxGL built for amd64 build 103 101 # 104 DLLS.win.amd64 += VBoxGL-x86 105 VBoxGL-x86_EXTENDS = VBoxGL 102 VBoxGL-x86_EXTENDS = VBoxGL 106 103 VBoxGL-x86_BLD_TRG_ARCH = x86 107 VBoxGL-x86_LIBS = \104 VBoxGL-x86_LIBS = \ 108 105 $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB) \ 109 106 $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib-x86$(VBOX_SUFF_LIB) \ … … 111 108 $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaUtilLib-x86$(VBOX_SUFF_LIB) \ 112 109 $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaLib-x86$(VBOX_SUFF_LIB) 113 VBoxGL-x86_DEFS = $(VBoxGL_DEFS) VBOX_WOW64110 VBoxGL-x86_DEFS = $(VBoxGL_DEFS) VBOX_WOW64 114 111 115 112 include $(FILE_KBUILD_SUB_FOOTER) 113 -
trunk/src/VBox/Additions/3D/win/VBoxICD/Makefile.kmk
r75621 r75635 19 19 include $(KBUILD_PATH)/subheader.kmk 20 20 21 VBOX_PATH_GL_GEN = $(PATH_OBJ)/VBoxGLgen22 21 VBOX_GL_ICD_DEF_FILE = $(VBOX_PATH_MESA)/src/gallium/state_trackers/wgl/opengl32.mingw.def 23 22 24 BLDDIRS += $(VBOX_PATH_GL_GEN)/ 23 DLLS += VBoxICD 24 DLLS.amd64 += VBoxICD-x86 25 25 26 DLLS += VBoxICD 27 VBoxICD_TEMPLATE = VBOXMESA3DGUESTR3DLLMinVista 28 # -wd4005: '__useHeader' : redefinition 29 VBoxICD_CFLAGS = -wd4005 30 31 VBoxICD_INCS += \ 26 VBoxICD_TEMPLATE = VBoxMesa3DGuestR3DllMinVista 27 # -wd4005: '__useHeader' : redefinition 28 VBoxICD_CFLAGS = -wd4005 29 VBoxICD_INCS = \ 32 30 $(VBOX_PATH_3D)/win/include \ 33 31 $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video \ 34 32 $(VBOX_GRAPHICS_INCS) 35 36 VBoxICD_SOURCES = \ 33 VBoxICD_SOURCES = \ 37 34 $(VBOX_PATH_MESA)/src/gallium/state_trackers/wgl/opengl32.def \ 38 $(VB OX_PATH_GL_GEN)/forwarders.asm \39 $(VB OX_PATH_GL_GEN)/pfns.c \35 $(VBoxICD_0_OUTDIR)/forwarders.asm \ 36 $(VBoxICD_0_OUTDIR)/pfns.c \ 40 37 VBoxICD.c \ 41 38 VBoxICD.rc 42 43 VBoxICD_LIBS = \ 39 VBoxICD_CLEAN = \ 40 $(VBoxICD_0_OUTDIR)/forwarders.asm \ 41 $(VBoxICD_0_OUTDIR)/pfns.c 42 VBoxICD_LIBS = \ 44 43 $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB) 45 44 46 $(VBOX_PATH_GL_GEN)/forwarders.asm: \ 47 $(PATH_SUB_CURRENT)/icd_forwarders.py \ 48 $(VBOX_GL_ICD_DEF_FILE) \ 49 Makefile.kmk \ 50 | $$(dir $$@) 45 $$(VBoxICD_0_OUTDIR)/forwarders.asm: \ 46 $(PATH_SUB_CURRENT)/icd_forwarders.py $(VBOX_GL_ICD_DEF_FILE) | $$(dir $$@) 51 47 $(call MSG_GENERATE,python,$@,$(VBOX_GL_ICD_DEF_FILE)) 52 48 $(QUIET)$(VBOX_BLD_PYTHON) $< $(VBOX_GL_ICD_DEF_FILE) $@ 53 $(VBOX_PATH_GL_GEN)/pfns.c: \ 54 $(PATH_SUB_CURRENT)/icd_pfns.py \ 55 $(VBOX_GL_ICD_DEF_FILE) \ 56 Makefile.kmk \ 57 | $$(dir $$@) 49 $$(VBoxICD_0_OUTDIR)/pfns.c: \ 50 $(PATH_SUB_CURRENT)/icd_pfns.py $(VBOX_GL_ICD_DEF_FILE) | $$(dir $$@) 58 51 $(call MSG_GENERATE,python,$@,$(VBOX_GL_ICD_DEF_FILE)) 59 52 $(QUIET)$(VBOX_BLD_PYTHON) $< $(VBOX_GL_ICD_DEF_FILE) $@ 60 61 VBoxICD_CLEAN = \62 $(VBOX_PATH_GL_GEN)/forwarders.asm \63 $(VBOX_PATH_GL_GEN)/pfns.c64 53 65 54 ifdef VBOX_SIGN_ADDITIONS … … 71 60 # x86 version built for amd64 build 72 61 # 73 DLLS.win.amd64 += VBoxICD-x86 74 VBoxICD-x86_EXTENDS = VBoxICD 62 VBoxICD-x86_EXTENDS = VBoxICD 75 63 VBoxICD-x86_BLD_TRG_ARCH = x86 76 VBoxICD-x86_LIBS = \64 VBoxICD-x86_LIBS = \ 77 65 $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB) 78 VBoxICD-x86_DEFS = $(VBoxICD_DEFS) VBOX_WOW6466 VBoxICD-x86_DEFS = $(VBoxICD_DEFS) VBOX_WOW64 79 67 80 68 include $(FILE_KBUILD_SUB_FOOTER) 69 -
trunk/src/VBox/Additions/3D/win/VBoxNine/Makefile.kmk
r75443 r75635 19 19 include $(KBUILD_PATH)/subheader.kmk 20 20 21 DLLS += VBoxNine 22 VBoxNine_TEMPLATE = VBOXMESA3DGUESTR3DLLMinVista 21 DLLS += VBoxNine 22 DLLS.amd64 += VBoxNine-x86 23 24 VBoxNine_TEMPLATE = VBoxMesa3DGuestR3DllMinVista 23 25 # -wd4100: unreferenced formal parameter 24 26 # -wd4200: nonstandard extension used : zero-sized array in struct/union … … 26 28 # -wd4255: no function prototype given 27 29 # -wd4668: 'something' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' 28 VBoxNine_CFLAGS += -wd4100 -wd4200 -wd4245 -wd4255 -wd466829 VBoxNine_INCS += \30 VBoxNine_CFLAGS = -wd4100 -wd4200 -wd4245 -wd4255 -wd4668 31 VBoxNine_INCS = \ 30 32 $(VBOX_PATH_MESA)/src/gallium/state_trackers/nine 31 32 VBoxNine_SOURCES = \ 33 VBoxNine_SOURCES = \ 33 34 VBoxNine.c \ 34 35 VBoxNine.rc \ 35 36 VBoxNine.def 36 37 VBoxNine_LIBS = \ 37 VBoxNine_LIBS = \ 38 38 $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB) \ 39 39 $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib$(VBOX_SUFF_LIB) \ … … 49 49 # VBoxNine-x86 - x86 version of VBoxNine built for amd64 build 50 50 # 51 DLLS.win.amd64 += VBoxNine-x86 52 VBoxNine-x86_EXTENDS = VBoxNine 51 VBoxNine-x86_EXTENDS = VBoxNine 53 52 VBoxNine-x86_BLD_TRG_ARCH = x86 54 VBoxNine-x86_LIBS = \53 VBoxNine-x86_LIBS = \ 55 54 $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB) \ 56 55 $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib-x86$(VBOX_SUFF_LIB) \ 57 56 $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaUtilLib-x86$(VBOX_SUFF_LIB) \ 58 57 $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaNineLib-x86$(VBOX_SUFF_LIB) 59 VBoxNine-x86_DEFS = $(VBoxNine_DEFS) VBOX_WOW6458 VBoxNine-x86_DEFS = $(VBoxNine_DEFS) VBOX_WOW64 60 59 61 60 include $(FILE_KBUILD_SUB_FOOTER) 61 -
trunk/src/VBox/Additions/3D/win/VBoxSVGA/Makefile.kmk
r75443 r75635 19 19 include $(KBUILD_PATH)/subheader.kmk 20 20 21 DLLS += VBoxSVGA 22 VBoxSVGA_TEMPLATE = VBOXMESA3DGUESTR3DLLMinVista 21 DLLS += VBoxSVGA 22 DLLS.amd64 += VBoxSVGA-x86 23 24 VBoxSVGA_TEMPLATE = VBoxMesa3DGuestR3DllMinVista 23 25 # -wd4005: vcc120: '__useHeader' : macro redefinition 24 26 # -wd4100: unreferenced formal parameter … … 28 30 # -wd4255: no function prototype given 29 31 # -wd4668: 'something' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' 30 VBoxSVGA_CFLAGS += -wd4005 -wd4100 -wd4200 -wd4211 -wd4245 -wd4255 -wd4668 31 32 VBoxSVGA_INCS += \ 32 VBoxSVGA_CFLAGS = -wd4005 -wd4100 -wd4200 -wd4211 -wd4245 -wd4255 -wd4668 33 VBoxSVGA_INCS = \ 33 34 $(VBOX_PATH_3D)/win/include \ 34 35 $(VBOX_PATH_MESA)/src/gallium/drivers/svga \ 35 36 $(VBOX_PATH_MESA)/src/gallium/drivers/svga/include \ 36 37 $(VBOX_PATH_MESA)/src/gallium/winsys/svga/drm 37 38 VBoxSVGA_SOURCES = \ 38 VBoxSVGA_SOURCES = \ 39 39 winsys/vmw_screen_ioctl.c \ 40 40 winsys/vmw_screen_wddm.c \ … … 43 43 VBoxSVGA.rc \ 44 44 VBoxSVGA.def 45 46 VBoxSVGA_LIBS = \ 45 VBoxSVGA_LIBS = \ 47 46 $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp$(VBOX_SUFF_LIB) \ 48 47 $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib$(VBOX_SUFF_LIB) \ … … 59 58 # VBoxSVGA-x86 - x86 version of VBoxSVGA built for amd64 build 60 59 # 61 DLLS.win.amd64 += VBoxSVGA-x86 62 VBoxSVGA-x86_EXTENDS = VBoxSVGA 60 VBoxSVGA-x86_EXTENDS = VBoxSVGA 63 61 VBoxSVGA-x86_BLD_TRG_ARCH = x86 64 VBoxSVGA-x86_LIBS = \62 VBoxSVGA-x86_LIBS = \ 65 63 $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmHlp-x86$(VBOX_SUFF_LIB) \ 66 64 $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaGalliumAuxLib-x86$(VBOX_SUFF_LIB) \ … … 68 66 $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaSVGAWinsysLib-x86$(VBOX_SUFF_LIB) \ 69 67 $(VBOX_PATH_ADDITIONS_LIB)/VBoxMesaSVGALib-x86$(VBOX_SUFF_LIB) 70 VBoxSVGA-x86_DEFS = $(VBoxSVGA_DEFS) VBOX_WOW6468 VBoxSVGA-x86_DEFS = $(VBoxSVGA_DEFS) VBOX_WOW64 71 69 72 70 include $(FILE_KBUILD_SUB_FOOTER) -
trunk/src/VBox/Additions/3D/win/VBoxWddmUmHlp/Makefile.kmk
r75456 r75635 19 19 include $(KBUILD_PATH)/subheader.kmk 20 20 21 LIBRARIES += VBoxWddmUmHlp21 LIBRARIES += VBoxWddmUmHlp 22 22 LIBRARIES.amd64 += VBoxWddmUmHlp-x86 23 23 … … 25 25 # VBoxWddmUmHlp - logger and other helpers for user mode driver 26 26 # 27 VBoxWddmUmHlp_TEMPLATE = VBOXMESA3DGUESTR3DLLMinVista28 VBoxWddmUmHlp_INST 29 VBoxWddmUmHlp_DEFS 30 VBoxWddmUmHlp_INCS 27 VBoxWddmUmHlp_TEMPLATE = VBoxMesa3DGuestR3DllMinVista 28 VBoxWddmUmHlp_INST = $(INST_ADDITIONS_LIB) 29 VBoxWddmUmHlp_DEFS = VBOX_WITH_WDDM 30 VBoxWddmUmHlp_INCS = \ 31 31 $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \ 32 32 $(VBOX_PATH_3D)/win/include \ 33 33 $(VBOX_GRAPHICS_INCS) 34 VBoxWddmUmHlp_SOURCES 34 VBoxWddmUmHlp_SOURCES = \ 35 35 D3DKMT.cpp \ 36 36 VBoxMpLogger.cpp … … 39 39 # 64-bit version for 32-bit build. 40 40 # 41 VBoxWddmUmHlp-x86_EXTENDS = VBoxWddmUmHlp41 VBoxWddmUmHlp-x86_EXTENDS = VBoxWddmUmHlp 42 42 VBoxWddmUmHlp-x86_BLD_TRG_ARCH = x86 43 43 44 44 include $(FILE_KBUILD_SUB_FOOTER) 45
Note:
See TracChangeset
for help on using the changeset viewer.