VirtualBox

Ignore:
Timestamp:
May 6, 2019 9:31:01 PM (6 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
130405
Message:

Additions,GuestHost/OpenGL,HostServices/SharedOpenGL: Get rid of the individual SPU shared libraries and merge them into the VBoxSharedCrOpenGL shared libraries on the host and VBoxOGL{,-x86} shared libraries for the guest additions, bugref:9435

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

Legend:

Unmodified
Added
Removed

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

    r78340 r78408  
    105105        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL.dll \
    106106        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm.dll \
    107         $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm.dll \
    108         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil.dll \
    109         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu.dll \
    110         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLfeedbackspu.dll \
    111         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpackspu.dll \
    112         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpassthroughspu.dll
     107        $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm.dll
    113108   VBoxWddm-inf_SOURCES.amd64 += \
    114109        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL-x86.dll \
    115110        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm-x86.dll \
    116         $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm-x86.dll \
    117         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil-x86.dll \
    118         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu-x86.dll \
    119         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLfeedbackspu-x86.dll \
    120         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpackspu-x86.dll \
    121         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpassthroughspu-x86.dll
     111        $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm-x86.dll
    122112  endif # VBOXWDDM_WITH_GL
    123113 endif # VBOX_SIGN_ADDITIONS
    … …  
    183173        $(INSTALL) -m 644 $< $(@D)
    184174
    185   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil.dll: $(PATH_OBJ)/VBoxOGLcrutil/VBoxOGLcrutil.dll | $$(dir $$@)
    186         $(INSTALL) -m 644 $< $(@D)
    187 
    188   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu.dll: $(PATH_OBJ)/VBoxOGLerrorspu/VBoxOGLerrorspu.dll | $$(dir $$@)
    189         $(INSTALL) -m 644 $< $(@D)
    190 
    191   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLfeedbackspu.dll: $(PATH_OBJ)/VBoxOGLfeedbackspu/VBoxOGLfeedbackspu.dll | $$(dir $$@)
    192         $(INSTALL) -m 644 $< $(@D)
    193 
    194   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpackspu.dll: $(PATH_OBJ)/VBoxOGLpackspu/VBoxOGLpackspu.dll | $$(dir $$@)
    195         $(INSTALL) -m 644 $< $(@D)
    196 
    197   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpassthroughspu.dll: $(PATH_OBJ)/VBoxOGLpassthroughspu/VBoxOGLpassthroughspu.dll | $$(dir $$@)
    198         $(INSTALL) -m 644 $< $(@D)
    199 
    200175  ifeq ($(KBUILD_TARGET_ARCH),amd64)
    201176   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL-x86.dll: $(PATH_OBJ)/VBoxOGL-x86/VBoxOGL-x86.dll | $$(dir $$@)
    … …  
    208183        $(INSTALL) -m 644 $< $(@D)
    209184
    210    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil-x86.dll: $(PATH_OBJ)/VBoxOGLcrutil-x86/VBoxOGLcrutil-x86.dll | $$(dir $$@)
    211         $(INSTALL) -m 644 $< $(@D)
    212 
    213    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu-x86.dll: $(PATH_OBJ)/VBoxOGLerrorspu-x86/VBoxOGLerrorspu-x86.dll | $$(dir $$@)
    214         $(INSTALL) -m 644 $< $(@D)
    215 
    216    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLfeedbackspu-x86.dll: $(PATH_OBJ)/VBoxOGLfeedbackspu-x86/VBoxOGLfeedbackspu-x86.dll | $$(dir $$@)
    217         $(INSTALL) -m 644 $< $(@D)
    218 
    219    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpackspu-x86.dll: $(PATH_OBJ)/VBoxOGLpackspu-x86/VBoxOGLpackspu-x86.dll | $$(dir $$@)
    220         $(INSTALL) -m 644 $< $(@D)
    221 
    222    $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpassthroughspu-x86.dll: $(PATH_OBJ)/VBoxOGLpassthroughspu-x86/VBoxOGLpassthroughspu-x86.dll | $$(dir $$@)
    223         $(INSTALL) -m 644 $< $(@D)
    224185  endif # ($(KBUILD_TARGET_ARCH), amd64)
    225186 endif # VBOXWDDM_WITH_GL
    … …  
    242203                $(if $(VBOXWDDM_WITH_GL),  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL.dll \
    243204                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm.dll \
    244                                            $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm.dll \
    245                                            $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil.dll \
    246                                            $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu.dll \
    247                                            $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLfeedbackspu.dll \
    248                                            $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpackspu.dll \
    249                                            $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpassthroughspu.dll, ) \
     205                                           $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm.dll, ) \
    250206                $(if $(VBOXWDDM_WITH_GL), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", \
    251207                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL-x86.dll \
    252208                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm-x86.dll \
    253                                            $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm-x86.dll \
    254                                            $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil-x86.dll \
    255                                            $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu-x86.dll \
    256                                            $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLfeedbackspu-x86.dll \
    257                                            $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpackspu-x86.dll \
    258                                            $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpassthroughspu-x86.dll, ), )
     209                                           $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm-x86.dll, ), )
    259210        $(call MSG_TOOL,Inf2Cat,VBoxWddm-inf,$@,$<)
    260211        $(call VBOX_MAKE_CAT_FN, $(@D),$@)

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

    r78340 r78408  
    7171;gl VBoxD3D9wddm.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    7272;gl wined3dwddm.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    73 ;gl VBoxOGLcrutil.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    74 ;gl VBoxOGLerrorspu.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    75 ;gl VBoxOGLfeedbackspu.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    76 ;gl VBoxOGLpackspu.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    77 ;gl VBoxOGLpassthroughspu.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    7873
    7974;amd64 [VBoxVideo.GL_wow64]
    … …  
    8176;amd64 ;gl VBoxD3D9wddm-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    8277;amd64 ;gl wined3dwddm-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    83 ;amd64 ;gl VBoxOGLcrutil-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    84 ;amd64 ;gl VBoxOGLerrorspu-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    85 ;amd64 ;gl VBoxOGLfeedbackspu-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    86 ;amd64 ;gl VBoxOGLpackspu-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    87 ;amd64 ;gl VBoxOGLpassthroughspu-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
    8878
    8979[VBoxVideo_SoftwareDeviceSettings]
    … …  
    140130;amd64 ;gl wined3dwddm-x86.dll = 1
    141131;gl wined3dwddm.dll = 1
    142 ;amd64 ;gl VBoxOGLcrutil-x86.dll = 1
    143 ;gl VBoxOGLcrutil.dll = 1
    144 ;amd64 ;gl VBoxOGLerrorspu-x86.dll = 1
    145 ;gl VBoxOGLerrorspu.dll = 1
    146 ;amd64 ;gl VBoxOGLfeedbackspu-x86.dll = 1
    147 ;gl VBoxOGLfeedbackspu.dll = 1
    148 ;amd64 ;gl VBoxOGLpackspu-x86.dll = 1
    149 ;gl VBoxOGLpackspu.dll = 1
    150 ;amd64 ;gl VBoxOGLpassthroughspu-x86.dll = 1
    151 ;gl VBoxOGLpassthroughspu.dll = 1
    152132
    153133[Strings]
Note: See TracChangeset for help on using the changeset viewer.

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