Changeset 95302 in vbox

Timestamp:

Jun 17, 2022 1:45:15 PM (2 years ago)

Author:

vboxsync

Message:

WDDM: retire VBoxICD wrapper. bugref:9272

Location:

trunk/src/VBox/Additions

Files:

• 3D/win/Makefile.kmk (modified) (1 diff)
• WINNT/Graphics/Video/Makefile.kmk (modified) (4 diffs)
• WINNT/Graphics/Video/mp/wddm/VBoxWddm.inf (modified) (5 diffs)
• WINNT/Installer/Makefile.kmk (modified) (2 diffs)
• WINNT/Installer/VBoxGuestAdditionsCommon.nsh (modified) (2 diffs)
• WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh (modified) (2 diffs)

trunk/src/VBox/Additions/3D/win/Makefile.kmk

@@ -20 +20 @@
 
 # Include sub-makefile.
-include $(PATH_SUB_CURRENT)/VBoxICD/Makefile.kmk
 include $(PATH_SUB_CURRENT)/VBoxGL/Makefile.kmk
 include $(PATH_SUB_CURRENT)/VBoxNine/Makefile.kmk

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

@@ -111 +111 @@
         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine.dll \
         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA.dll \
-        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD.dll \
         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL.dll
    VBoxWddm-inf_SOURCES.amd64 += \
         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine-x86.dll \
         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA-x86.dll \
-        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD-x86.dll \
         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL-x86.dll
   endif
@@ -150 +148 @@
         $(INSTALL) -m 644 "$<" "$(@D)"
 
-   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD.dll: $$(VBoxICD_1_TARGET) | $$(dir $$@)
-        $(INSTALL) -m 644 "$<" "$(@D)"
-
    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL.dll: $$(VBoxGL_1_TARGET) | $$(dir $$@)
         $(INSTALL) -m 644 "$<" "$(@D)"
@@ -161 +156 @@
 
     $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA-x86.dll: $$(VBoxSVGA-x86_1_TARGET) | $$(dir $$@)
-        $(INSTALL) -m 644 $< $(@D)
-
-    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD-x86.dll: $$(VBoxICD-x86_1_TARGET) | $$(dir $$@)
         $(INSTALL) -m 644 $< $(@D)
 
@@ -181 +173 @@
                         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine.dll \
                         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA.dll \
-                        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD.dll \
                         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL.dll \
                         $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", \
                                 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine-x86.dll \
                                 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA-x86.dll \
-                                $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD-x86.dll \
                                 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL-x86.dll, ), )
         $(call MSG_TOOL,Inf2Cat,VBoxWddm-inf,$@,$<)

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

@@ -56 +56 @@
 ;mesa3d VBoxNine.dll,,,0x00004000     ; COPYFLG_IN_USE_TRY_RENAME
 ;mesa3d VBoxSVGA.dll,,,0x00004000     ; COPYFLG_IN_USE_TRY_RENAME
-;mesa3d VBoxICD.dll,,,0x00004000      ; COPYFLG_IN_USE_TRY_RENAME
 ;mesa3d VBoxGL.dll,,,0x00004000       ; COPYFLG_IN_USE_TRY_RENAME
 
@@ -64 +63 @@
 ;amd64 ;mesa3d VBoxNine-x86.dll,,,0x00004000     ; COPYFLG_IN_USE_TRY_RENAME
 ;amd64 ;mesa3d VBoxSVGA-x86.dll,,,0x00004000     ; COPYFLG_IN_USE_TRY_RENAME
-;amd64 ;mesa3d VBoxICD-x86.dll,,,0x00004000      ; COPYFLG_IN_USE_TRY_RENAME
 ;amd64 ;mesa3d VBoxGL-x86.dll,,,0x00004000       ; COPYFLG_IN_USE_TRY_RENAME
 
@@ -74 +72 @@
 ;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
+;mesa3d         HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxGL
+;amd64 ;mesa3d  HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxGL-x86
 ;mesa3d         HKR,, OpenGLFlags,         %REG_DWORD%,    0x00000001
 ;amd64 ;mesa3d  HKR,, OpenGLFlagsWoW,      %REG_DWORD%,    0x00000001
@@ -111 +109 @@
 ;amd64 ;mesa3d VBoxNine-x86.dll = 1
 ;amd64 ;mesa3d VBoxSVGA-x86.dll = 1
-;amd64 ;mesa3d VBoxICD-x86.dll = 1
 ;amd64 ;mesa3d VBoxGL-x86.dll = 1
 ;dispd3d VBoxDispD3D.dll = 1
@@ -117 +114 @@
 ;mesa3d VBoxNine.dll = 1
 ;mesa3d VBoxSVGA.dll = 1
-;mesa3d VBoxICD.dll = 1
 ;mesa3d VBoxGL.dll = 1
 

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -121 +121 @@
         $(PATH_STAGE_BIN)/additions/VBoxNine.dll \
         $(PATH_STAGE_BIN)/additions/VBoxSVGA.dll \
-        $(PATH_STAGE_BIN)/additions/VBoxICD.dll \
         $(PATH_STAGE_BIN)/additions/VBoxGL.dll
  endif
@@ -140 +139 @@
         $(PATH_STAGE_BIN)/additions/VBoxNine-x86.dll \
         $(PATH_STAGE_BIN)/additions/VBoxSVGA-x86.dll \
-        $(PATH_STAGE_BIN)/additions/VBoxICD-x86.dll \
         $(PATH_STAGE_BIN)/additions/VBoxGL-x86.dll
   endif

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh

@@ -90 +90 @@
     FILE "$%PATH_OUT%\bin\additions\VBoxNine.dll"
     FILE "$%PATH_OUT%\bin\additions\VBoxSVGA.dll"
-    FILE "$%PATH_OUT%\bin\additions\VBoxICD.dll"
     FILE "$%PATH_OUT%\bin\additions\VBoxGL.dll"
   !endif
@@ -102 +101 @@
       FILE "$%PATH_OUT%\bin\additions\VBoxNine-x86.dll"
       FILE "$%PATH_OUT%\bin\additions\VBoxSVGA-x86.dll"
-      FILE "$%PATH_OUT%\bin\additions\VBoxICD-x86.dll"
       FILE "$%PATH_OUT%\bin\additions\VBoxGL-x86.dll"
     !endif

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

@@ -262 +262 @@
       FILE "$%PATH_OUT%\bin\additions\VBoxNine.dll"
       FILE "$%PATH_OUT%\bin\additions\VBoxSVGA.dll"
-      FILE "$%PATH_OUT%\bin\additions\VBoxICD.dll"
       FILE "$%PATH_OUT%\bin\additions\VBoxGL.dll"
     !endif
@@ -274 +273 @@
         FILE "$%PATH_OUT%\bin\additions\VBoxNine-x86.dll"
         FILE "$%PATH_OUT%\bin\additions\VBoxSVGA-x86.dll"
-        FILE "$%PATH_OUT%\bin\additions\VBoxICD-x86.dll"
         FILE "$%PATH_OUT%\bin\additions\VBoxGL-x86.dll"
       !endif