Changeset 94485 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video

Timestamp:

Apr 6, 2022 7:00:56 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

150822

Message:

WDDM: added VBOX_WITH_WDDM_DX (not enabled yet) to include the new driver into the additions installer. bugref:9845

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video

Files:

• Makefile.kmk (modified) (5 diffs)
• disp/Makefile.kmk (modified) (2 diffs)
• mp/wddm/VBoxWddm.inf (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk

@@ -79 +79 @@
 
  VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDM_WITH_DISPD3D),-e 's/^;dispd3d  *//', -e '/^;dispd3d /d')
+ VBOXWDDM_EDIT_INF_DISPDX_FN_ARG = $(if $(VBOX_WITH_WDDM_DX),-e 's/^;dispdx  *//', -e '/^;dispdx /d')
  VBOXWDDM_EDIT_INF_MESA3D_FN_ARG = $(if $(VBOX_WITH_MESA3D),-e 's/^;mesa3d  *//', -e '/^;mesa3d /d')
 
@@ -84 +85 @@
                 $(PATH_SUB_CURRENT)/mp/wddm/VBoxWddm.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
         $(call MSG_GENERATE,VBoxWddm-inf,$@,$<)
-        $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_MESA3D_FN_ARG))
+        $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_DISPDX_FN_ARG) $(VBOXWDDM_EDIT_INF_MESA3D_FN_ARG))
 
  if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
@@ -98 +99 @@
         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D-x86.dll
   endif # VBOXWDDM_WITH_DISPD3D
+
+  ifdef VBOX_WITH_WDDM_DX
+   VBoxWddm-inf_SOURCES += \
+       $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX.dll
+   VBoxWddm-inf_SOURCES.amd64 += \
+       $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX-x86.dll
+  endif
 
   ifdef VBOX_WITH_MESA3D
@@ -124 +132 @@
    endif
   endif # VBOXWDDM_WITH_DISPD3D
+
+  ifdef VBOX_WITH_WDDM_DX
+   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX.dll: $$(VBoxDX_1_TARGET) | $$(dir $$@)
+        $(INSTALL) -m 644 $< $(@D)
+
+   ifeq ($(KBUILD_TARGET_ARCH),amd64)
+    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX-x86.dll: $$(VBoxDX-x86_1_TARGET) | $$(dir $$@)
+        $(INSTALL) -m 644 $< $(@D)
+   endif
+  endif
 
   ifdef VBOX_WITH_MESA3D
@@ -158 +176 @@
                 $(if $(VBOXWDDM_WITH_DISPD3D), $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D.dll, ) \
                 $(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D-x86.dll, ), ) \
+                $(if $(VBOX_WITH_WDDM_DX), $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX.dll, ) \
+                $(if $(VBOX_WITH_WDDM_DX), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDX-x86.dll, ), ) \
                 $(if $(VBOX_WITH_MESA3D), \
                         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine.dll \

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

@@ -93 +93 @@
   VBoxDispD3D_INSTTYPE       = none
   VBoxDispD3D_DEBUG_INSTTYPE = both
+  ifdef VBOX_WITH_WDDM_DX
+   VBoxDX_INSTTYPE           = none
+   VBoxDX_DEBUG_INSTTYPE     = both
+  endif
  endif
 endif
@@ -174 +178 @@
 VBoxDispD3D-x86_DEFS = $(VBoxDispD3D_DEFS) VBOX_WDDM_WOW64
 
+#
+# VGPU10 driver VBoxDX
+#
+ ifdef VBOX_WITH_VMSVGA3D_DX
+DLLS += VBoxDX
+VBoxDX_TEMPLATE = VBoxGuestR3DllMinVista
+VBoxDX_DEFS     = UNICODE _UNICODE VBOX_WITH_VMSVGA3D_DX
+VBoxDX_DEFS    += D3D_UMD_INTERFACE_VERSION=D3D_UMD_INTERFACE_VERSION_WIN8
+VBoxDX_DEFS    += DXGKDDI_INTERFACE_VERSION=DXGKDDI_INTERFACE_VERSION_WIN8
+VBoxDX_INCS     = \
+        $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/shared \
+        $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/common/wddm \
+        $(PATH_ROOT)/src/VBox/Additions/3D/win/include \
+        $(PATH_ROOT)/src/VBox/Additions/3D/mesa/mesa-17.3.9/src/gallium/drivers/svga/include \
+        $(VBOX_GRAPHICS_INCS)
+VBoxDX_SOURCES  = \
+        wddm/dx/VBoxDXDDI.cpp \
+        wddm/dx/VBoxDX.rc \
+        wddm/dx/VBoxDX.def
+VBoxDX_LIBS     = \
+        $(VBOX_LIB_IPRT_GUEST_R3) \
+        Psapi.lib \
+        $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
+        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt$(VBOX_SUFF_LIB)
+
+# 64-bit systems need a 32-bit version of VBoxDX
+DLLS.amd64 += VBoxDX-x86
+VBoxDX-x86_EXTENDS = VBoxDX
+VBoxDX-x86_BLD_TRG_ARCH = x86
+VBoxDX-x86_LIBS = \
+        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
+        $(VBOX_LIB_VBGL_R3_X86) \
+        Psapi.lib \
+        $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
+        $(VBOX_PATH_ADDITIONS_LIB)/VBoxWddmUmKmt-x86$(VBOX_SUFF_LIB)
+VBoxDX-x86_DEFS = $(VBoxDX_DEFS) VBOX_WDDM_WOW64
+ endif # VBOX_WITH_VMSVGA3D_DX
+
 include $(PATH_SUB_CURRENT)/wddm/shared/Makefile.kmk
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxWddm.inf

@@ -53 +53 @@
 [VBoxVideo.Display]
 ;dispd3d VBoxDispD3D.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;dispdx VBoxDX.dll,,,0x00004000       ; COPYFLG_IN_USE_TRY_RENAME
 ;mesa3d VBoxNine.dll,,,0x00004000     ; COPYFLG_IN_USE_TRY_RENAME
 ;mesa3d VBoxSVGA.dll,,,0x00004000     ; COPYFLG_IN_USE_TRY_RENAME
@@ -60 +61 @@
 ;amd64 [VBoxVideo.Display_wow64]
 ;amd64 ;dispd3d VBoxDispD3D-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;amd64 ;dispdx VBoxDX-x86.dll,,,0x00004000       ; COPYFLG_IN_USE_TRY_RENAME
 ;amd64 ;mesa3d VBoxNine-x86.dll,,,0x00004000     ; COPYFLG_IN_USE_TRY_RENAME
 ;amd64 ;mesa3d VBoxSVGA-x86.dll,,,0x00004000     ; COPYFLG_IN_USE_TRY_RENAME
@@ -69 +71 @@
 ;dispd3d        HKR,, UserModeDriverName,      %REG_MULTI_SZ%, VBoxDispD3D.dll
 ;amd64 ;dispd3d HKR,, UserModeDriverNameWow,   %REG_MULTI_SZ%, VBoxDispD3D-x86.dll
+;dispdx         HKR,, InstalledDisplayDrivers, %REG_MULTI_SZ%, VBoxDispD3D, VBoxDX, VBoxDX
+;dispdx         HKR,, UserModeDriverName,      %REG_MULTI_SZ%, VBoxDispD3D.dll, VBoxDX.dll, VBoxDX.dll
+;amd64 ;dispdx  HKR,, UserModeDriverNameWow,   %REG_MULTI_SZ%, VBoxDispD3D-x86.dll, VBoxDX-x86.dll, VBoxDX-x86.dll
 ;mesa3d         HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxICD
 ;amd64 ;mesa3d  HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxICD-x86
@@ -103 +108 @@
 VBoxWddm.sys = 1
 ;amd64 ;dispd3d VBoxDispD3D-x86.dll = 1
+;amd64 ;dispdx VBoxDX-x86.dll = 1
 ;amd64 ;mesa3d VBoxNine-x86.dll = 1
 ;amd64 ;mesa3d VBoxSVGA-x86.dll = 1
@@ -108 +114 @@
 ;amd64 ;mesa3d VBoxGL-x86.dll = 1
 ;dispd3d VBoxDispD3D.dll = 1
+;dispdx  VBoxDX.dll = 1
 ;mesa3d VBoxNine.dll = 1
 ;mesa3d VBoxSVGA.dll = 1