Changeset 94485 in vbox
- Timestamp:
- Apr 6, 2022 7:00:56 AM (3 years ago)
- Location:
- trunk/src/VBox/Additions/WINNT
- Files:
-
- 6 edited
-
Graphics/Video/Makefile.kmk (modified) (5 diffs)
-
Graphics/Video/disp/Makefile.kmk (modified) (2 diffs)
-
Graphics/Video/mp/wddm/VBoxWddm.inf (modified) (5 diffs)
-
Installer/Makefile.kmk (modified) (3 diffs)
-
Installer/VBoxGuestAdditionsCommon.nsh (modified) (2 diffs)
-
Installer/VBoxGuestAdditionsW2KXP.nsh (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk
r94160 r94485 79 79 80 80 VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDM_WITH_DISPD3D),-e 's/^;dispd3d *//', -e '/^;dispd3d /d') 81 VBOXWDDM_EDIT_INF_DISPDX_FN_ARG = $(if $(VBOX_WITH_WDDM_DX),-e 's/^;dispdx *//', -e '/^;dispdx /d') 81 82 VBOXWDDM_EDIT_INF_MESA3D_FN_ARG = $(if $(VBOX_WITH_MESA3D),-e 's/^;mesa3d *//', -e '/^;mesa3d /d') 82 83 … … 84 85 $(PATH_SUB_CURRENT)/mp/wddm/VBoxWddm.inf $(MAKEFILE_CURRENT) | $$(dir $$@) 85 86 $(call MSG_GENERATE,VBoxWddm-inf,$@,$<) 86 $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_ MESA3D_FN_ARG))87 $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_DISPDX_FN_ARG) $(VBOXWDDM_EDIT_INF_MESA3D_FN_ARG)) 87 88 88 89 if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS) … … 98 99 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D-x86.dll 99 100 endif # VBOXWDDM_WITH_DISPD3D 101 102 ifdef VBOX_WITH_WDDM_DX 103 VBoxWddm-inf_SOURCES += \ 104 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX.dll 105 VBoxWddm-inf_SOURCES.amd64 += \ 106 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX-x86.dll 107 endif 100 108 101 109 ifdef VBOX_WITH_MESA3D … … 124 132 endif 125 133 endif # VBOXWDDM_WITH_DISPD3D 134 135 ifdef VBOX_WITH_WDDM_DX 136 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX.dll: $$(VBoxDX_1_TARGET) | $$(dir $$@) 137 $(INSTALL) -m 644 $< $(@D) 138 139 ifeq ($(KBUILD_TARGET_ARCH),amd64) 140 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX-x86.dll: $$(VBoxDX-x86_1_TARGET) | $$(dir $$@) 141 $(INSTALL) -m 644 $< $(@D) 142 endif 143 endif 126 144 127 145 ifdef VBOX_WITH_MESA3D … … 158 176 $(if $(VBOXWDDM_WITH_DISPD3D), $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D.dll, ) \ 159 177 $(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D-x86.dll, ), ) \ 178 $(if $(VBOX_WITH_WDDM_DX), $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX.dll, ) \ 179 $(if $(VBOX_WITH_WDDM_DX), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX-x86.dll, ), ) \ 160 180 $(if $(VBOX_WITH_MESA3D), \ 161 181 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine.dll \ -
trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk
r93265 r94485 93 93 VBoxDispD3D_INSTTYPE = none 94 94 VBoxDispD3D_DEBUG_INSTTYPE = both 95 ifdef VBOX_WITH_WDDM_DX 96 VBoxDX_INSTTYPE = none 97 VBoxDX_DEBUG_INSTTYPE = both 98 endif 95 99 endif 96 100 endif … … 174 178 VBoxDispD3D-x86_DEFS = $(VBoxDispD3D_DEFS) VBOX_WDDM_WOW64 175 179 180 # 181 # VGPU10 driver VBoxDX 182 # 183 ifdef VBOX_WITH_VMSVGA3D_DX 184 DLLS += VBoxDX 185 VBoxDX_TEMPLATE = VBoxGuestR3DllMinVista 186 VBoxDX_DEFS = UNICODE _UNICODE VBOX_WITH_VMSVGA3D_DX 187 VBoxDX_DEFS += D3D_UMD_INTERFACE_VERSION=D3D_UMD_INTERFACE_VERSION_WIN8 188 VBoxDX_DEFS += DXGKDDI_INTERFACE_VERSION=DXGKDDI_INTERFACE_VERSION_WIN8 189 VBoxDX_INCS = \ 190 $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \ 191 $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/common/wddm \ 192 $(PATH_ROOT)/src/VBox/Additions/3D/win/include \ 193 $(PATH_ROOT)/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/gallium/drivers/svga/include \ 194 $(VBOX_GRAPHICS_INCS) 195 VBoxDX_SOURCES = \ 196 wddm/dx/VBoxDXDDI.cpp \ 197 wddm/dx/VBoxDX.rc \ 198 wddm/dx/VBoxDX.def 199 VBoxDX_LIBS = \ 200 $(VBOX_LIB_IPRT_GUEST_R3) \ 201 Psapi.lib \ 202 $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB) \ 203 $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt$(VBOX_SUFF_LIB) 204 205 # 64-bit systems need a 32-bit version of VBoxDX 206 DLLS.amd64 += VBoxDX-x86 207 VBoxDX-x86_EXTENDS = VBoxDX 208 VBoxDX-x86_BLD_TRG_ARCH = x86 209 VBoxDX-x86_LIBS = \ 210 $(VBOX_LIB_IPRT_GUEST_R3_X86) \ 211 $(VBOX_LIB_VBGL_R3_X86) \ 212 Psapi.lib \ 213 $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \ 214 $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt-x86$(VBOX_SUFF_LIB) 215 VBoxDX-x86_DEFS = $(VBoxDX_DEFS) VBOX_WDDM_WOW64 216 endif # VBOX_WITH_VMSVGA3D_DX 217 176 218 include $(PATH_SUB_CURRENT)/wddm/shared/Makefile.kmk 177 219 -
trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxWddm.inf
r93115 r94485 53 53 [VBoxVideo.Display] 54 54 ;dispd3d VBoxDispD3D.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 55 ;dispdx VBoxDX.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 55 56 ;mesa3d VBoxNine.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 56 57 ;mesa3d VBoxSVGA.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME … … 60 61 ;amd64 [VBoxVideo.Display_wow64] 61 62 ;amd64 ;dispd3d VBoxDispD3D-x86.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 63 ;amd64 ;dispdx VBoxDX-x86.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 62 64 ;amd64 ;mesa3d VBoxNine-x86.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME 63 65 ;amd64 ;mesa3d VBoxSVGA-x86.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME … … 69 71 ;dispd3d HKR,, UserModeDriverName, %REG_MULTI_SZ%, VBoxDispD3D.dll 70 72 ;amd64 ;dispd3d HKR,, UserModeDriverNameWow, %REG_MULTI_SZ%, VBoxDispD3D-x86.dll 73 ;dispdx HKR,, InstalledDisplayDrivers, %REG_MULTI_SZ%, VBoxDispD3D, VBoxDX, VBoxDX 74 ;dispdx HKR,, UserModeDriverName, %REG_MULTI_SZ%, VBoxDispD3D.dll, VBoxDX.dll, VBoxDX.dll 75 ;amd64 ;dispdx HKR,, UserModeDriverNameWow, %REG_MULTI_SZ%, VBoxDispD3D-x86.dll, VBoxDX-x86.dll, VBoxDX-x86.dll 71 76 ;mesa3d HKR,, OpenGLDriverName, %REG_MULTI_SZ%, VBoxICD 72 77 ;amd64 ;mesa3d HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxICD-x86 … … 103 108 VBoxWddm.sys = 1 104 109 ;amd64 ;dispd3d VBoxDispD3D-x86.dll = 1 110 ;amd64 ;dispdx VBoxDX-x86.dll = 1 105 111 ;amd64 ;mesa3d VBoxNine-x86.dll = 1 106 112 ;amd64 ;mesa3d VBoxSVGA-x86.dll = 1 … … 108 114 ;amd64 ;mesa3d VBoxGL-x86.dll = 1 109 115 ;dispd3d VBoxDispD3D.dll = 1 116 ;dispdx VBoxDX.dll = 1 110 117 ;mesa3d VBoxNine.dll = 1 111 118 ;mesa3d VBoxSVGA.dll = 1 -
trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk
r94160 r94485 113 113 $(PATH_STAGE_BIN)/additions/VBoxWddm.inf \ 114 114 $(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll 115 ifdef VBOX_WITH_WDDM_DX 116 DRIVER_FILES += \ 117 $(PATH_STAGE_BIN)/additions/VBoxDX.dll 118 endif 115 119 ifdef VBOX_WITH_MESA3D 116 120 DRIVER_FILES += \ … … 128 132 DRIVER_FILES += \ 129 133 $(PATH_STAGE_BIN)/additions/VBoxDispD3D-x86.dll 134 ifdef VBOX_WITH_WDDM_DX 135 DRIVER_FILES += \ 136 $(PATH_STAGE_BIN)/additions/VBoxDX-x86.dll 137 endif 130 138 ifdef VBOX_WITH_MESA3D 131 139 DRIVER_FILES += \ … … 166 174 -E 'VBOX_WITH_LICENSE_INSTALL_RTF=$(if $(VBOX_BRAND_LICENSE_RTF),1,0)' \ 167 175 -E 'VBOX_WITH_WDDM=$(if $(VBOX_WITH_WDDM),1,0)' \ 176 -E 'VBOX_WITH_WDDM_DX=$(if $(VBOX_WITH_WDDM_DX),1,0)' \ 168 177 -E 'VBOX_WITH_MESA3D=$(if $(VBOX_WITH_MESA3D),1,0)' \ 169 178 -E 'VBOX_BRAND_WIN_ADD_INST_DLGBMP=$(subst /,\,$(VBOX_BRAND_WIN_ADD_INST_DLGBMP))' \ -
trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh
r94160 r94485 84 84 FILE "$%PATH_OUT%\bin\additions\VBoxWddm.inf" 85 85 FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll" 86 !if $%VBOX_WITH_WDDM_DX% == "1" 87 FILE "$%PATH_OUT%\bin\additions\VBoxDX.dll" 88 !endif 86 89 !if $%VBOX_WITH_MESA3D% == "1" 87 90 FILE "$%PATH_OUT%\bin\additions\VBoxNine.dll" … … 93 96 !if $%KBUILD_TARGET_ARCH% == "amd64" 94 97 FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D-x86.dll" 98 !if $%VBOX_WITH_WDDM_DX% == "1" 99 FILE "$%PATH_OUT%\bin\additions\VBoxDX-x86.dll" 100 !endif 95 101 !if $%VBOX_WITH_MESA3D% == "1" 96 102 FILE "$%PATH_OUT%\bin\additions\VBoxNine-x86.dll" -
trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh
r94160 r94485 256 256 257 257 FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll" 258 !if $%VBOX_WITH_WDDM_DX% == "1" 259 FILE "$%PATH_OUT%\bin\additions\VBoxDX.dll" 260 !endif 258 261 !if $%VBOX_WITH_MESA3D% == "1" 259 262 FILE "$%PATH_OUT%\bin\additions\VBoxNine.dll" … … 265 268 !if $%KBUILD_TARGET_ARCH% == "amd64" 266 269 FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D-x86.dll" 270 !if $%VBOX_WITH_WDDM_DX% == "1" 271 FILE "$%PATH_OUT%\bin\additions\VBoxDX-x86.dll" 272 !endif 267 273 !if $%VBOX_WITH_MESA3D% == "1" 268 274 FILE "$%PATH_OUT%\bin\additions\VBoxNine-x86.dll" … … 475 481 ; Obsolete files end 476 482 Delete /REBOOTOK "$INSTDIR\VBoxDispD3D.dll" 483 !if $%VBOX_WITH_WDDM_DX% == "1" 484 Delete /REBOOTOK "$INSTDIR\VBoxDX.dll" 485 !endif 477 486 !if $%VBOX_WITH_MESA3D% == "1" 478 487 Delete /REBOOTOK "$INSTDIR\VBoxNine.dll" … … 489 498 !if $%KBUILD_TARGET_ARCH% == "amd64" 490 499 Delete /REBOOTOK "$INSTDIR\VBoxDispD3D-x86.dll" 500 !if $%VBOX_WITH_WDDM_DX% == "1" 501 Delete /REBOOTOK "$INSTDIR\VBoxDX-x86.dll" 502 !endif 491 503 !if $%VBOX_WITH_MESA3D% == "1" 492 504 Delete /REBOOTOK "$INSTDIR\VBoxNine-x86.dll" … … 557 569 !if $%KBUILD_TARGET_ARCH% == "amd64" 558 570 Delete /REBOOTOK "$g_strSysWow64\VBoxDispD3D-x86.dll" 571 !endif 572 573 !if $%VBOX_WITH_WDDM_DX% == "1" 574 Delete /REBOOTOK "$g_strSystemDir\VBoxDX.dll" 575 !if $%KBUILD_TARGET_ARCH% == "amd64" 576 Delete /REBOOTOK "$g_strSysWow64\VBoxDX-x86.dll" 577 !endif 559 578 !endif 560 579
Note:
See TracChangeset
for help on using the changeset viewer.
