Index: /trunk/src/VBox/Additions/WINNT/Graphics/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Makefile.kmk (revision 29441) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Makefile.kmk (revision 29442) @@ -67,4 +67,7 @@ ifdef VBOXWDDM VBOXWDDM_WITH_DISPD3D = 1 +ifeq ($(KBUILD_TARGET_ARCH), x86) +VBOXWDDM_WITH_GL = 1 +endif # @@ -90,4 +93,23 @@ endif +ifdef VBOXWDDM_WITH_GL +VBoxVideoWddm-inf_SOURCES += \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll +VBoxVideoWddm-inf_SOURCES.amd64 += \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL64.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu64.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil64.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu64.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu64.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu64.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu64.dll +endif + endif # signing VBoxVideoWddm-inf_CLEAN = $(VBoxVideoWddm-inf_SOURCES) @@ -96,8 +118,9 @@ VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDM_WITH_DISPD3D),-e 's/^;dispd3d *//', -e '/^;dispd3d /d') +VBOXWDDM_EDIT_INF_GL_FN_ARG = $(if $(VBOXWDDM_WITH_GL),-e 's/^;gl *//', -e '/^;gl /d') $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.inf: $(PATH_SUB_CURRENT)/Miniport/wddm/VBoxVideoWddm.inf $(MAKEFILE_CURRENT) | $$(call DIRDEP,$$(@D)) $(call MSG_GENERATE,VBoxVideoWddm-inf,$@,$<) - $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG)) + $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_GL_FN_ARG)) $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys: $$(TARGET_VBoxVideoWddm) | $$(call DIRDEP,$$(@D)) @@ -110,4 +133,50 @@ ifeq ($(KBUILD_TARGET_ARCH), amd64) $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D64.dll: $$(TARGET_VBoxDispD3D64) | $$(call DIRDEP,$$(@D)) + $(INSTALL) -m 644 $< $(@D) + endif +endif + +ifdef VBOXWDDM_WITH_GL +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll: $$(TARGET_VBoxOGL) | $$(call DIRDEP,$$(@D)) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll: $$(TARGET_VBoxOGLarrayspu) | $$(call DIRDEP,$$(@D)) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll: $$(TARGET_VBoxOGLcrutil) | $$(call DIRDEP,$$(@D)) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll: $$(TARGET_VBoxOGLerrorspu) | $$(call DIRDEP,$$(@D)) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll: $$(TARGET_VBoxOGLfeedbackspu) | $$(call DIRDEP,$$(@D)) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll: $$(TARGET_VBoxOGLpackspu) | $$(call DIRDEP,$$(@D)) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll: $$(TARGET_VBoxOGLpassthroughspu) | $$(call DIRDEP,$$(@D)) + $(INSTALL) -m 644 $< $(@D) + + ifeq ($(KBUILD_TARGET_ARCH), amd64) +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL64.dll: $$(TARGET_VBoxOGL64) | $$(call DIRDEP,$$(@D)) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu64.dll: $$(TARGET_VBoxOGLarrayspu64) | $$(call DIRDEP,$$(@D)) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil64.dll: $$(TARGET_VBoxOGLcrutil64) | $$(call DIRDEP,$$(@D)) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu64.dll: $$(TARGET_VBoxOGLerrorspu64) | $$(call DIRDEP,$$(@D)) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu64.dll: $$(TARGET_VBoxOGLfeedbackspu64) | $$(call DIRDEP,$$(@D)) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu64.dll: $$(TARGET_VBoxOGLpackspu64) | $$(call DIRDEP,$$(@D)) + $(INSTALL) -m 644 $< $(@D) + +$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu64.dll: $$(TARGET_VBoxOGLpassthroughspu64) | $$(call DIRDEP,$$(@D)) $(INSTALL) -m 644 $< $(@D) endif @@ -118,5 +187,20 @@ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys \ $(if $(VBOXWDDM_WITH_DISPD3D), $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll, ) \ - $(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D64.dll, ), ) + $(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D64.dll, ), ) \ + $(if $(VBOXWDDM_WITH_GL), $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll, ) \ + $(if $(VBOXWDDM_WITH_GL), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL64.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu64.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil64.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu64.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu64.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu64.dll \ + $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu64.dll, ), ) $(call MSG_TOOL,Inf2Cat,VBoxVideoWddm-inf,$@,$<) $(call VBOX_MAKE_CAT_FN, $(@D),$@) Index: /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.inf =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.inf (revision 29441) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.inf (revision 29442) @@ -26,4 +26,6 @@ VBoxVideo.Display = 11 ; system32 ;amd64 VBoxVideo.Display_wow64 = 10,SysWow64 ; SysWow64 +VBoxVideo.GL = 11 ; system32 +;amd64 VBoxVideo.GL_wow64 = 10,SysWow64 ; SysWow64 [Manufacturer] @@ -38,6 +40,6 @@ FeatureScore = F8 Include = msdv.inf -;x86 CopyFiles = VBoxVideo.Miniport, VBoxVideo.Display -;amd64 CopyFiles = VBoxVideo.Miniport, VBoxVideo.Display, VBoxVideo.Display_wow64 +;x86 CopyFiles = VBoxVideo.Miniport, VBoxVideo.Display, VBoxVideo.GL +;amd64 CopyFiles = VBoxVideo.Miniport, VBoxVideo.Display, VBoxVideo.Display_wow64, VBoxVideo.GL, VBoxVideo.GL_wow64 AddReg = VBoxVideo_SoftwareDeviceSettings ;todo: clear XPDM driver settings: DelReg = VBoxVideo_RemoveDeviceSettings @@ -54,4 +56,23 @@ ;amd64 ;dispd3d VBoxDispD3D64.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME +;x86 [VBoxVideo.GL] +;amd64 [VBoxVideo.GL_wow64] +;gl VBoxOGL.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME +;gl VBoxOGLarrayspu.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME +;gl VBoxOGLcrutil.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME +;gl VBoxOGLerrorspu.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME +;gl VBoxOGLfeedbackspu.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME +;gl VBoxOGLpackspu.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME +;gl VBoxOGLpassthroughspu.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME + +;amd64 [VBoxVideo.GL] +;amd64 ;gl VBoxOGL64.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME +;amd64 ;gl VBoxOGLarrayspu64.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME +;amd64 ;gl VBoxOGLcrutil64.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME +;amd64 ;gl VBoxOGLerrorspu64.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME +;amd64 ;gl VBoxOGLfeedbackspu64.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME +;amd64 ;gl VBoxOGLpackspu64.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME +;amd64 ;gl VBoxOGLpassthroughspu64.dll,,,0x00004000 ; COPYFLG_IN_USE_TRY_RENAME + [VBoxVideo_SoftwareDeviceSettings] ;x86 ;dispd3d HKR,, InstalledDisplayDrivers, %REG_MULTI_SZ%, VBoxDispD3D @@ -60,4 +81,11 @@ ;amd64 ;dispd3d HKR,, UserModeDriverName, %REG_MULTI_SZ%, VBoxDispD3D64.dll ;amd64 ;dispd3d HKR,, UserModeDriverNameWow, %REG_MULTI_SZ%, VBoxDispD3D.dll +;x86 ;gl HKR,, OpenGLDriverName, %REG_MULTI_SZ%, VBoxOGL.dll +;amd64 ;gl HKR,, OpenGLDriverName, %REG_MULTI_SZ%, VBoxOGL64.dll +;amd64 ;gl HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxOGL.dll +;gl HKR,, OpenGLFlags, %REG_DWORD%, 0x00000001 +;amd64 ;gl HKR,, OpenGLFlagsWoW, %REG_DWORD%, 0x00000001 +;gl HKR,, OpenGLVersion, %REG_DWORD%, 0x00000001 +;amd64 ;gl HKR,, OpenGLVersionWoW, %REG_DWORD%, 0x00000001 HKR,, VgaCompatible, %REG_DWORD%, 0 @@ -65,4 +93,19 @@ ;dispd3d 11,,VBoxDispD3D.dll,1 ;amd64 ;dispd3d 11,,VBoxDispD3D64.dll,1 +;amd64 ;gl 11,,VBoxOGL64.dll,1 +;gl 11,,VBoxOGL.dll,1 +;amd64 ;gl 11,,VBoxOGLarrayspu64.dll,1 +;gl 11,,VBoxOGLarrayspu.dll,1 +;amd64 ;gl 11,,VBoxOGLcrutil64.dll,1 +;gl 11,,VBoxOGLcrutil.dll,1 +;amd64 ;gl 11,,VBoxOGLerrorspu64.dll,1 +;gl 11,,VBoxOGLerrorspu.dll,1 +;amd64 ;gl 11,,VBoxOGLfeedbackspu64.dll,1 +;gl 11,,VBoxOGLfeedbackspu.dll,1 +;amd64 ;gl 11,,VBoxOGLpackspu64.dll,1 +;gl 11,,VBoxOGLpackspu.dll,1 +;amd64 ;gl 11,,VBoxOGLpassthroughspu64.dll,1 +;gl 11,,VBoxOGLpassthroughspu.dll,1 + [VBoxVideo.Services] @@ -83,6 +126,4 @@ HKR,,TypesSupported,0x00010001,7 -; [VBoxVideo.OpenGLSoftwareSettings] - [SourceDisksNames] 1 = %VBoxVideo.Disk%,,,"" @@ -90,6 +131,20 @@ [SourceDisksFiles] VBoxVideoWddm.sys = 1 -;amd64 VBoxDispD3D64.dll = 1 -VBoxDispD3D.dll = 1 +;amd64 ;dispd3d VBoxDispD3D64.dll = 1 +;dispd3d VBoxDispD3D.dll = 1 +;amd64 ;gl VBoxOGL64.dll = 1 +;gl VBoxOGL.dll = 1 +;amd64 ;gl VBoxOGLarrayspu64.dll = 1 +;gl VBoxOGLarrayspu.dll = 1 +;amd64 ;gl VBoxOGLcrutil64.dll = 1 +;gl VBoxOGLcrutil.dll = 1 +;amd64 ;gl VBoxOGLerrorspu64.dll = 1 +;gl VBoxOGLerrorspu.dll = 1 +;amd64 ;gl VBoxOGLfeedbackspu64.dll = 1 +;gl VBoxOGLfeedbackspu.dll = 1 +;amd64 ;gl VBoxOGLpackspu64.dll = 1 +;gl VBoxOGLpackspu.dll = 1 +;amd64 ;gl VBoxOGLpassthroughspu64.dll = 1 +;gl VBoxOGLpassthroughspu.dll = 1 [Strings]