VirtualBox

Changeset 29442 in vbox for trunk


Ignore:
Timestamp:
May 13, 2010 9:36:35 AM (15 years ago)
Author:
vboxsync
Message:

wddm/3d: add ogl icd lib info to video drv inf (not tested yet)

Location:
trunk/src/VBox/Additions/WINNT/Graphics
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r28800 r29442  
    6767ifdef VBOXWDDM
    6868VBOXWDDM_WITH_DISPD3D = 1
     69ifeq ($(KBUILD_TARGET_ARCH), x86)
     70VBOXWDDM_WITH_GL = 1
     71endif
    6972
    7073#
    … …  
    9093endif
    9194
     95ifdef VBOXWDDM_WITH_GL
     96VBoxVideoWddm-inf_SOURCES += \
     97 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll \
     98 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll \
     99 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll \
     100 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll \
     101 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll \
     102 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll \
     103 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll
     104VBoxVideoWddm-inf_SOURCES.amd64 += \
     105 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL64.dll \
     106 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu64.dll \
     107 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil64.dll \
     108 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu64.dll \
     109 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu64.dll \
     110 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu64.dll \
     111 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu64.dll
     112endif
     113
    92114endif # signing
    93115VBoxVideoWddm-inf_CLEAN = $(VBoxVideoWddm-inf_SOURCES)
    … …  
    96118
    97119VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDM_WITH_DISPD3D),-e 's/^;dispd3d  *//', -e '/^;dispd3d /d')
     120VBOXWDDM_EDIT_INF_GL_FN_ARG      = $(if $(VBOXWDDM_WITH_GL),-e 's/^;gl  *//', -e '/^;gl /d')
    98121
    99122$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.inf: $(PATH_SUB_CURRENT)/Miniport/wddm/VBoxVideoWddm.inf $(MAKEFILE_CURRENT) | $$(call DIRDEP,$$(@D))
    100123        $(call MSG_GENERATE,VBoxVideoWddm-inf,$@,$<)
    101         $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG))
     124        $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_GL_FN_ARG))
    102125
    103126$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys: $$(TARGET_VBoxVideoWddm) | $$(call DIRDEP,$$(@D))
    … …  
    110133 ifeq ($(KBUILD_TARGET_ARCH), amd64)
    111134$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D64.dll: $$(TARGET_VBoxDispD3D64) | $$(call DIRDEP,$$(@D))
     135        $(INSTALL) -m 644 $< $(@D)
     136 endif
     137endif
     138
     139ifdef VBOXWDDM_WITH_GL
     140$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll: $$(TARGET_VBoxOGL) | $$(call DIRDEP,$$(@D))
     141        $(INSTALL) -m 644 $< $(@D)
     142
     143$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll: $$(TARGET_VBoxOGLarrayspu) | $$(call DIRDEP,$$(@D))
     144        $(INSTALL) -m 644 $< $(@D)
     145
     146$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll: $$(TARGET_VBoxOGLcrutil) | $$(call DIRDEP,$$(@D))
     147        $(INSTALL) -m 644 $< $(@D)
     148
     149$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll: $$(TARGET_VBoxOGLerrorspu) | $$(call DIRDEP,$$(@D))
     150        $(INSTALL) -m 644 $< $(@D)
     151
     152$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll: $$(TARGET_VBoxOGLfeedbackspu) | $$(call DIRDEP,$$(@D))
     153        $(INSTALL) -m 644 $< $(@D)
     154
     155$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll: $$(TARGET_VBoxOGLpackspu) | $$(call DIRDEP,$$(@D))
     156        $(INSTALL) -m 644 $< $(@D)
     157
     158$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll: $$(TARGET_VBoxOGLpassthroughspu) | $$(call DIRDEP,$$(@D))
     159        $(INSTALL) -m 644 $< $(@D)
     160
     161 ifeq ($(KBUILD_TARGET_ARCH), amd64)
     162$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL64.dll: $$(TARGET_VBoxOGL64) | $$(call DIRDEP,$$(@D))
     163        $(INSTALL) -m 644 $< $(@D)
     164
     165$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu64.dll: $$(TARGET_VBoxOGLarrayspu64) | $$(call DIRDEP,$$(@D))
     166        $(INSTALL) -m 644 $< $(@D)
     167
     168$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil64.dll: $$(TARGET_VBoxOGLcrutil64) | $$(call DIRDEP,$$(@D))
     169        $(INSTALL) -m 644 $< $(@D)
     170
     171$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu64.dll: $$(TARGET_VBoxOGLerrorspu64) | $$(call DIRDEP,$$(@D))
     172        $(INSTALL) -m 644 $< $(@D)
     173
     174$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu64.dll: $$(TARGET_VBoxOGLfeedbackspu64) | $$(call DIRDEP,$$(@D))
     175        $(INSTALL) -m 644 $< $(@D)
     176
     177$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu64.dll: $$(TARGET_VBoxOGLpackspu64) | $$(call DIRDEP,$$(@D))
     178        $(INSTALL) -m 644 $< $(@D)
     179
     180$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu64.dll: $$(TARGET_VBoxOGLpassthroughspu64) | $$(call DIRDEP,$$(@D))
    112181        $(INSTALL) -m 644 $< $(@D)
    113182 endif
    … …  
    118187        $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys \
    119188        $(if $(VBOXWDDM_WITH_DISPD3D), $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll, ) \
    120         $(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D64.dll, ), )
     189        $(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D64.dll, ), ) \
     190        $(if $(VBOXWDDM_WITH_GL),  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll \
     191                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll \
     192                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll \
     193                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll \
     194                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll \
     195                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll \
     196                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll, ) \
     197        $(if $(VBOXWDDM_WITH_GL), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", \
     198                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL64.dll \
     199                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu64.dll \
     200                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil64.dll \
     201                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu64.dll \
     202                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu64.dll \
     203                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu64.dll \
     204                                   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu64.dll, ), )
    121205        $(call MSG_TOOL,Inf2Cat,VBoxVideoWddm-inf,$@,$<)
    122206        $(call VBOX_MAKE_CAT_FN, $(@D),$@)

  • trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.inf

    r28800 r29442  
    2626VBoxVideo.Display  = 11 ; system32
    2727;amd64 VBoxVideo.Display_wow64  = 10,SysWow64 ; SysWow64
     28VBoxVideo.GL  = 11 ; system32
     29;amd64 VBoxVideo.GL_wow64  = 10,SysWow64 ; SysWow64
    2830
    2931[Manufacturer]
    … …  
    3840FeatureScore = F8
    3941Include = msdv.inf
    40 ;x86   CopyFiles = VBoxVideo.Miniport, VBoxVideo.Display
    41 ;amd64 CopyFiles = VBoxVideo.Miniport, VBoxVideo.Display, VBoxVideo.Display_wow64
     42;x86   CopyFiles = VBoxVideo.Miniport, VBoxVideo.Display, VBoxVideo.GL
     43;amd64 CopyFiles = VBoxVideo.Miniport, VBoxVideo.Display, VBoxVideo.Display_wow64, VBoxVideo.GL, VBoxVideo.GL_wow64
    4244AddReg = VBoxVideo_SoftwareDeviceSettings
    4345;todo: clear XPDM driver settings: DelReg = VBoxVideo_RemoveDeviceSettings
    … …  
    5456;amd64 ;dispd3d VBoxDispD3D64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    5557
     58;x86   [VBoxVideo.GL]
     59;amd64 [VBoxVideo.GL_wow64]
     60;gl VBoxOGL.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     61;gl VBoxOGLarrayspu.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     62;gl VBoxOGLcrutil.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     63;gl VBoxOGLerrorspu.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     64;gl VBoxOGLfeedbackspu.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     65;gl VBoxOGLpackspu.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     66;gl VBoxOGLpassthroughspu.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     67
     68;amd64 [VBoxVideo.GL]
     69;amd64 ;gl VBoxOGL64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     70;amd64 ;gl VBoxOGLarrayspu64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     71;amd64 ;gl VBoxOGLcrutil64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     72;amd64 ;gl VBoxOGLerrorspu64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     73;amd64 ;gl VBoxOGLfeedbackspu64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     74;amd64 ;gl VBoxOGLpackspu64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     75;amd64 ;gl VBoxOGLpassthroughspu64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
     76
    5677[VBoxVideo_SoftwareDeviceSettings]
    5778;x86   ;dispd3d HKR,, InstalledDisplayDrivers, %REG_MULTI_SZ%, VBoxDispD3D
    … …  
    6081;amd64 ;dispd3d HKR,, UserModeDriverName,    %REG_MULTI_SZ%, VBoxDispD3D64.dll
    6182;amd64 ;dispd3d HKR,, UserModeDriverNameWow,    %REG_MULTI_SZ%, VBoxDispD3D.dll
     83;x86   ;gl HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxOGL.dll
     84;amd64 ;gl HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxOGL64.dll
     85;amd64 ;gl HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxOGL.dll
     86;gl        HKR,, OpenGLFlags,         %REG_DWORD%,    0x00000001
     87;amd64 ;gl HKR,, OpenGLFlagsWoW,      %REG_DWORD%,    0x00000001
     88;gl        HKR,, OpenGLVersion,       %REG_DWORD%,    0x00000001
     89;amd64 ;gl HKR,, OpenGLVersionWoW,    %REG_DWORD%,    0x00000001
    6290HKR,, VgaCompatible, %REG_DWORD%, 0
    6391
    … …  
    6593;dispd3d 11,,VBoxDispD3D.dll,1
    6694;amd64 ;dispd3d 11,,VBoxDispD3D64.dll,1
     95;amd64 ;gl 11,,VBoxOGL64.dll,1
     96;gl 11,,VBoxOGL.dll,1
     97;amd64 ;gl 11,,VBoxOGLarrayspu64.dll,1
     98;gl 11,,VBoxOGLarrayspu.dll,1
     99;amd64 ;gl 11,,VBoxOGLcrutil64.dll,1
     100;gl 11,,VBoxOGLcrutil.dll,1
     101;amd64 ;gl 11,,VBoxOGLerrorspu64.dll,1
     102;gl 11,,VBoxOGLerrorspu.dll,1
     103;amd64 ;gl 11,,VBoxOGLfeedbackspu64.dll,1
     104;gl 11,,VBoxOGLfeedbackspu.dll,1
     105;amd64 ;gl 11,,VBoxOGLpackspu64.dll,1
     106;gl 11,,VBoxOGLpackspu.dll,1
     107;amd64 ;gl 11,,VBoxOGLpassthroughspu64.dll,1
     108;gl 11,,VBoxOGLpassthroughspu.dll,1
     109
    67110
    68111[VBoxVideo.Services]
    … …  
    83126HKR,,TypesSupported,0x00010001,7
    84127
    85 ; [VBoxVideo.OpenGLSoftwareSettings]
    86 
    87128[SourceDisksNames]
    881291 = %VBoxVideo.Disk%,,,""
    … …  
    90131[SourceDisksFiles]
    91132VBoxVideoWddm.sys = 1
    92 ;amd64 VBoxDispD3D64.dll = 1
    93 VBoxDispD3D.dll = 1
     133;amd64 ;dispd3d VBoxDispD3D64.dll = 1
     134;dispd3d VBoxDispD3D.dll = 1
     135;amd64 ;gl VBoxOGL64.dll = 1
     136;gl VBoxOGL.dll = 1
     137;amd64 ;gl VBoxOGLarrayspu64.dll = 1
     138;gl VBoxOGLarrayspu.dll = 1
     139;amd64 ;gl VBoxOGLcrutil64.dll = 1
     140;gl VBoxOGLcrutil.dll = 1
     141;amd64 ;gl VBoxOGLerrorspu64.dll = 1
     142;gl VBoxOGLerrorspu.dll = 1
     143;amd64 ;gl VBoxOGLfeedbackspu64.dll = 1
     144;gl VBoxOGLfeedbackspu.dll = 1
     145;amd64 ;gl VBoxOGLpackspu64.dll = 1
     146;gl VBoxOGLpackspu.dll = 1
     147;amd64 ;gl VBoxOGLpassthroughspu64.dll = 1
     148;gl VBoxOGLpassthroughspu.dll = 1
    94149
    95150[Strings]
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette