Changeset 81111 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Oct 4, 2019 4:14:17 PM (5 years ago)

Author:

vboxsync

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

133736

Message:

WDDM: install the OpenGL ICD if VBOX_WITH_MESA3D is defined; remove obsolete code. bugref:9529

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxWddm.inf (modified) (4 diffs)

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

@@ -30 +30 @@
 VBoxVideo.Display  = 11 ; system32
 ;amd64 VBoxVideo.Display_wow64  = 10,SysWow64 ; SysWow64
-VBoxVideo.GL  = 11 ; system32
-;amd64 VBoxVideo.GL_wow64  = 10,SysWow64 ; SysWow64
 
 [Manufacturer]
@@ -44 +42 @@
 FeatureScore = F8
 Include = msdv.inf
-;x86   CopyFiles = VBoxVideo.Miniport, VBoxVideo.Display, VBoxVideo.GL
-;amd64 CopyFiles = VBoxVideo.Miniport, VBoxVideo.Display, VBoxVideo.Display_wow64, VBoxVideo.GL, VBoxVideo.GL_wow64
+;x86   CopyFiles = VBoxVideo.Miniport, VBoxVideo.Display
+;amd64 CopyFiles = VBoxVideo.Miniport, VBoxVideo.Display, VBoxVideo.Display_wow64
 AddReg = VBoxVideo_SoftwareDeviceSettings
 ;todo: clear XPDM driver settings: DelReg = VBoxVideo_RemoveDeviceSettings
@@ -67 +65 @@
 ;amd64 ;mesa3d VBoxGL-x86.dll,,,0x00004000       ; COPYFLG_IN_USE_TRY_RENAME
 
-[VBoxVideo.GL]
-;gl VBoxOGL.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
-;gl VBoxD3D9wddm.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
-;gl wined3dwddm.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
-
-;amd64 [VBoxVideo.GL_wow64]
-;amd64 ;gl VBoxOGL-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
-;amd64 ;gl VBoxD3D9wddm-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
-;amd64 ;gl wined3dwddm-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
-
 [VBoxVideo_SoftwareDeviceSettings]
-;dispd3d HKR,, InstalledDisplayDrivers, %REG_MULTI_SZ%, VBoxDispD3D
-;dispd3d HKR,, UserModeDriverName,    %REG_MULTI_SZ%, VBoxDispD3D.dll
-;amd64 ;dispd3d HKR,, UserModeDriverNameWow,    %REG_MULTI_SZ%, VBoxDispD3D-x86.dll
-;icd        HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxICD
-;amd64 ;icd HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxICD-x86
-;icd        HKR,, OpenGLFlags,         %REG_DWORD%,    0x00000001
-;amd64 ;icd HKR,, OpenGLFlagsWoW,      %REG_DWORD%,    0x00000001
-;icd        HKR,, OpenGLVersion,       %REG_DWORD%,    0x00000001
-;amd64 ;icd HKR,, OpenGLVersionWoW,    %REG_DWORD%,    0x00000001
+;dispd3d        HKR,, InstalledDisplayDrivers, %REG_MULTI_SZ%, VBoxDispD3D
+;dispd3d        HKR,, UserModeDriverName,      %REG_MULTI_SZ%, VBoxDispD3D.dll
+;amd64 ;dispd3d HKR,, UserModeDriverNameWow,   %REG_MULTI_SZ%, VBoxDispD3D-x86.dll
+;mesa3d         HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxICD
+;amd64 ;mesa3d  HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxICD-x86
+;mesa3d         HKR,, OpenGLFlags,         %REG_DWORD%,    0x00000001
+;amd64 ;mesa3d  HKR,, OpenGLFlagsWoW,      %REG_DWORD%,    0x00000001
+;mesa3d         HKR,, OpenGLVersion,       %REG_DWORD%,    0x00000001
+;amd64 ;mesa3d  HKR,, OpenGLVersionWoW,    %REG_DWORD%,    0x00000001
 HKR,, VgaCompatible, %REG_DWORD%, 0
 
@@ -124 +112 @@
 ;mesa3d VBoxICD.dll = 1
 ;mesa3d VBoxGL.dll = 1
-;amd64 ;gl VBoxOGL-x86.dll = 1
-;gl VBoxOGL.dll = 1
-;amd64 ;gl VBoxD3D9wddm-x86.dll = 1
-;gl VBoxD3D9wddm.dll = 1
-;amd64 ;gl wined3dwddm-x86.dll = 1
-;gl wined3dwddm.dll = 1
 
 [Strings]