VirtualBox

Changeset 78408 in vbox for trunk


Ignore:
Timestamp:
May 6, 2019 9:31:01 PM (6 years ago)
Author:
vboxsync
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
Files:
2 deleted
31 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]

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

    r78388 r78408  
    102102ifdef VBOX_WITH_CROGL
    103103DRIVER_FILES += \
    104         $(PATH_STAGE_BIN)/additions/VBoxOGLcrutil.dll \
    105         $(PATH_STAGE_BIN)/additions/VBoxOGLerrorspu.dll \
    106         $(PATH_STAGE_BIN)/additions/VBoxOGLpackspu.dll \
    107         $(PATH_STAGE_BIN)/additions/VBoxOGLpassthroughspu.dll \
    108         $(PATH_STAGE_BIN)/additions/VBoxOGLfeedbackspu.dll \
    109104        $(PATH_STAGE_BIN)/additions/VBoxOGL.dll \
    110105        $(PATH_STAGE_BIN)/additions/wined3d.dll \
    … …  
    115110        # running 32-bit OpenGL apps on that.
    116111        DRIVER_FILES += \
    117                 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLcrutil.dll \
    118                 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLerrorspu.dll \
    119                 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLpackspu.dll \
    120                 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLpassthroughspu.dll \
    121                 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLfeedbackspu.dll \
    122112                $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGL.dll \
    123113                $(VBOX_PATH_ADDITIONS.win.x86)/wined3d.dll \
    124114                $(VBOX_PATH_ADDITIONS.win.x86)/VBoxD3D9.dll \
    125115                $(VBOX_PATH_ADDITIONS.win.x86)/VBoxD3D8.dll
    126 
    127116 endif
    128117endif
    … …  
    162151        $(PATH_STAGE_BIN)/additions/wined3dwddm-x86.dll \
    163152        $(PATH_STAGE_BIN)/additions/VBoxD3D9wddm-x86.dll \
    164         $(PATH_STAGE_BIN)/additions/VBoxOGL-x86.dll \
    165         $(PATH_STAGE_BIN)/additions/VBoxOGLcrutil-x86.dll \
    166         $(PATH_STAGE_BIN)/additions/VBoxOGLerrorspu-x86.dll \
    167         $(PATH_STAGE_BIN)/additions/VBoxOGLfeedbackspu-x86.dll \
    168         $(PATH_STAGE_BIN)/additions/VBoxOGLpackspu-x86.dll \
    169         $(PATH_STAGE_BIN)/additions/VBoxOGLpassthroughspu-x86.dll
     153        $(PATH_STAGE_BIN)/additions/VBoxOGL-x86.dll
    170154  endif
    171155 endif
    172156endif
    173 
    174157VB_WIN_ADD_NSIS_ENV := \
    175158        -E 'PATH_OUT=$(subst /,\,$(PATH_OUT))' \

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

    r78340 r78408  
    6464!if $%VBOX_WITH_CROGL% == "1"
    6565  ; crOpenGL
    66   FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
    67   FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
    68   FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"
    69   FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll"
    70   FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"
    7166  FILE "$%PATH_OUT%\bin\additions\VBoxOGL.dll"
    7267
    … …  
    8378    FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll"
    8479    FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll"
    85     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLcrutil.dll"
    86     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLerrorspu.dll"
    87     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLpackspu.dll"
    88     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLpassthroughspu.dll"
    89     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLfeedbackspu.dll"
    9080    FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGL.dll"
    9181    FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxD3D8.dll"
    … …  
    113103
    114104  !if $%VBOX_WITH_CROGL% == "1"
    115     FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
    116     FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
    117     FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"
    118     FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll"
    119     FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"
    120105    FILE "$%PATH_OUT%\bin\additions\VBoxOGL.dll"
    121106
    … …  
    134119
    135120    !if $%VBOX_WITH_CROGL% == "1"
    136       FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll"
    137       FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll"
    138       FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu-x86.dll"
    139       FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu-x86.dll"
    140       FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu-x86.dll"
    141121      FILE "$%PATH_OUT%\bin\additions\VBoxOGL-x86.dll"
    142122

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

    r78389 r78408  
    248248
    249249    !if $%VBOX_WITH_CROGL% == "1"
    250       FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
    251       FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
    252       FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"
    253       FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll"
    254       FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"
    255250      FILE "$%PATH_OUT%\bin\additions\VBoxOGL.dll"
    256251
    … …  
    269264
    270265      !if $%VBOX_WITH_CROGL% == "1"
    271         FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll"
    272         FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll"
    273         FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu-x86.dll"
    274         FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu-x86.dll"
    275         FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu-x86.dll"
    276266        FILE "$%PATH_OUT%\bin\additions\VBoxOGL-x86.dll"
    277267
    … …  
    292282  StrCpy $0 "$TEMP\VBoxGuestAdditions\VBoxOGL"
    293283  CreateDirectory "$0"
    294   !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"         "$g_strSystemDir\VBoxOGLcrutil.dll"         "$0"
    295   !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"       "$g_strSystemDir\VBoxOGLerrorspu.dll"       "$0"
    296   !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"        "$g_strSystemDir\VBoxOGLpackspu.dll"        "$0"
    297   !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll" "$g_strSystemDir\VBoxOGLpassthroughspu.dll" "$0"
    298   !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"    "$g_strSystemDir\VBoxOGLfeedbackspu.dll"    "$0"
    299284  !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGL.dll"               "$g_strSystemDir\VBoxOGL.dll"               "$0"
    300285  !if $%BUILD_TARGET_ARCH% == "amd64"
    … …  
    309294    ; path after calling EnableX64FSRedirection
    310295    ${EnableX64FSRedirection}
    311     !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLcrutil.dll"         "$SYSDIR\VBoxOGLcrutil.dll"         "$0"
    312     !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLerrorspu.dll"       "$SYSDIR\VBoxOGLerrorspu.dll"       "$0"
    313     !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLpackspu.dll"        "$SYSDIR\VBoxOGLpackspu.dll"        "$0"
    314     !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLpassthroughspu.dll" "$SYSDIR\VBoxOGLpassthroughspu.dll" "$0"
    315     !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLfeedbackspu.dll"    "$SYSDIR\VBoxOGLfeedbackspu.dll"    "$0"
    316296    !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGL.dll"               "$SYSDIR\VBoxOGL.dll"               "$0"
    317297    ${DisableX64FSRedirection}
    … …  
    540520  !endif
    541521
     522    ; Obsolete files begin (they were merged into VBoxOGL.dll)
    542523    Delete /REBOOTOK "$INSTDIR\VBoxOGLcrutil.dll"
    543524    Delete /REBOOTOK "$INSTDIR\VBoxOGLarrayspu.dll"
    … …  
    546527    Delete /REBOOTOK "$INSTDIR\VBoxOGLpassthroughspu.dll"
    547528    Delete /REBOOTOK "$INSTDIR\VBoxOGLfeedbackspu.dll"
     529    ; Obsolete files end
     530
    548531    Delete /REBOOTOK "$INSTDIR\VBoxOGL.dll"
    549532
    … …  
    562545    !endif
    563546
     547      ; Obsolete files begin (they were merged into VBoxOGL-x86.dll)
    564548      Delete /REBOOTOK "$INSTDIR\VBoxOGLcrutil-x86.dll"
    565549      Delete /REBOOTOK "$INSTDIR\VBoxOGLarrayspu-x86.dll"
    … …  
    568552      Delete /REBOOTOK "$INSTDIR\VBoxOGLpassthroughspu-x86.dll"
    569553      Delete /REBOOTOK "$INSTDIR\VBoxOGLfeedbackspu-x86.dll"
     554      ; Obsolete files end
     555
    570556      Delete /REBOOTOK "$INSTDIR\VBoxOGL-x86.dll"
    571557
    … …  
    661647  ${EndIf}
    662648
     649  ; Obsolete files begin (they were merged into VBoxOGL.dll)
    663650  Delete /REBOOTOK "$g_strSystemDir\VBoxOGLcrutil.dll"
    664651  Delete /REBOOTOK "$g_strSystemDir\VBoxOGLarrayspu.dll"
    … …  
    667654  Delete /REBOOTOK "$g_strSystemDir\VBoxOGLpassthroughspu.dll"
    668655  Delete /REBOOTOK "$g_strSystemDir\VBoxOGLfeedbackspu.dll"
     656  ; Obsolete files end
     657
    669658  Delete /REBOOTOK "$g_strSystemDir\VBoxOGL.dll"
    670659
    … …  
    698687  !if $%BUILD_TARGET_ARCH% == "amd64"
    699688    ; Only 64-bit installer: Also remove 32-bit DLLs on 64-bit target arch in Wow64 node
     689    ; Obsolete files begin (they were merged into VBoxOGL-x86.dll)
    700690    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLcrutil-x86.dll"
    701691    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLarrayspu-x86.dll"
    … …  
    704694    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLpassthroughspu-x86.dll"
    705695    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLfeedbackspu-x86.dll"
     696    ; Obsolete files end
     697
    706698    Delete /REBOOTOK "$g_strSysWow64\VBoxOGL-x86.dll"
    707699

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

    r78340 r78408  
    13471347    So just enumerate the 32-bit files in the SYSWOW directory. */
    13481348#ifdef RT_ARCH_AMD64
    1349         { szSysWowDir,  "VBoxOGLcrutil.dll" },
    1350         { szSysWowDir,  "VBoxOGLerrorspu.dll" },
    1351         { szSysWowDir,  "VBoxOGLpackspu.dll" },
    1352         { szSysWowDir,  "VBoxOGLpassthroughspu.dll" },
    1353         { szSysWowDir,  "VBoxOGLfeedbackspu.dll" },
    1354         { szSysWowDir,  "VBoxOGL.dll" },
     1349        { szSysWowDir,  "VBoxOGL-x86.dll" },
    13551350#else  /* !RT_ARCH_AMD64 */
    1356         { szSysDir,     "VBoxOGLcrutil.dll" },
    1357         { szSysDir,     "VBoxOGLerrorspu.dll" },
    1358         { szSysDir,     "VBoxOGLpackspu.dll" },
    1359         { szSysDir,     "VBoxOGLpassthroughspu.dll" },
    1360         { szSysDir,     "VBoxOGLfeedbackspu.dll" },
    13611351        { szSysDir,     "VBoxOGL.dll" },
    13621352#endif /* !RT_ARCH_AMD64 */

  • trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

    r78340 r78408  
    2727if1of ($(KBUILD_TARGET), win linux solaris freebsd)
    2828 DLLS += \
    29     VBoxOGL \
     29    VBoxOGL
     30
     31 LIBRARIES += \
    3032    VBoxOGLpassthroughspu \
    3133    VBoxOGLpackspu \
    … …  
    3436
    3537VBOX_OGL_X86_GUEST_DLLS = \
    36      VBoxOGL-x86 \
     38     VBoxOGL-x86
     39
     40VBOX_OGL_X86_GUEST_LIBRARIES = \
    3741     VBoxOGLpassthroughspu-x86 \
    3842     VBoxOGLpackspu-x86 \
    … …  
    4145ifdef VBOX_WITH_WDDM
    4246 DLLS.win.amd64 += $(VBOX_OGL_X86_GUEST_DLLS)
     47 LIBRARIES.win.amd64 += $(VBOX_OGL_X86_GUEST_LIBRARIES)
    4348endif
    4449
    … …  
    202207 endif
    203208endif
    204 # VBoxOGL_LIBS = \  # VBOX_LIB_OGL_CRUTIL includes these and caused an interesting conflict.
    205 #       $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
    206 #       $(VBOX_LIB_VBGL_R3_SHARED) \
    207 
    208209VBoxOGL_LIBS = \
     210        $(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
     211        $(VBOX_LIB_VBGL_R3_SHARED) \
    209212        $(VBOX_LIB_OGL_CRUTIL) \
    210         $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
     213        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
     214        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) \
     215        $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker$(VBOX_SUFF_LIB) \
     216        $(PATH_STAGE_LIB)/additions/VBoxOGLfeedbackspu$(VBOX_SUFF_LIB) \
     217        $(PATH_STAGE_LIB)/additions/VBoxOGLpassthroughspu$(VBOX_SUFF_LIB) \
     218        $(PATH_STAGE_LIB)/additions/VBoxOGLpackspu$(VBOX_SUFF_LIB) \
     219        $(PATH_STAGE_LIB)/additions/VBoxOGLerrorspu$(VBOX_SUFF_LIB)
    211220
    212221VBoxOGL_LIBS.win += \
    … …  
    256265        $(VBOX_LIB_VBGL_R3_SHARED_X86) \
    257266        $(VBOX_LIB_OGL_CRUTIL_X86) \
    258         $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB)
     267        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
     268        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) \
     269        $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker-x86$(VBOX_SUFF_LIB) \
     270        $(PATH_STAGE_LIB)/additions/VBoxOGLfeedbackspu-x86$(VBOX_SUFF_LIB) \
     271        $(PATH_STAGE_LIB)/additions/VBoxOGLpassthroughspu-x86$(VBOX_SUFF_LIB) \
     272        $(PATH_STAGE_LIB)/additions/VBoxOGLpackspu-x86$(VBOX_SUFF_LIB) \
     273        $(PATH_STAGE_LIB)/additions/VBoxOGLerrorspu-x86$(VBOX_SUFF_LIB)
    259274
    260275VBoxOGL-x86_LIBS.win += \
    … …  
    448463# VBoxOGLpassthroughspu
    449464#
    450 VBoxOGLpassthroughspu_TEMPLATE    = VBOXCROGLR3GUESTDLL
     465VBoxOGLpassthroughspu_TEMPLATE    = VBOXCROGLR3GUESTLIB
    451466VBoxOGLpassthroughspu_INCS        = \
    452467        passthrough \
    … …  
    456471        $(VBOX_GL_INCS)
    457472endif
    458 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    459  VBoxOGLpassthroughspu_INSTTYPE.win = none
    460  VBoxOGLpassthroughspu_DEBUG_INSTTYPE.win = both
    461 endif
    462473VBoxOGLpassthroughspu_SOURCES     = \
    463474        passthrough/passthroughspu_init.c \
    464475        $(VBOX_PATH_CROGL_GENFILES)/passthroughspu.c
    465 VBoxOGLpassthroughspu_SOURCES.win = \
    466         passthrough/passthrough.def \
    467         passthrough/passthroughspu.rc
    468476VBoxOGLpassthroughspu_CLEAN       = \
    469477        $(VBOX_PATH_CROGL_GENFILES)/passthroughspu.c
    470 VBoxOGLpassthroughspu_LIBS        = \
    471         $(VBOX_LIB_OGL_CRUTIL)
    472478ifdef VBOX_WITH_CRHGSMI
    473479VBoxOGLpassthroughspu_DEFS.win   += VBOX_WITH_CRHGSMI
    … …  
    497503# VBoxOGLpackspu
    498504#
    499 VBoxOGLpackspu_TEMPLATE      = VBOXCROGLR3GUESTDLL
     505VBoxOGLpackspu_TEMPLATE      = VBOXCROGLR3GUESTLIB
    500506VBoxOGLpackspu_DEFS          = TRACKS_STATE=1 PACKS=1
    501507VBoxOGLpackspu_INCS          = \
    … …  
    505511 VBoxOGLpackspu_INCS += \
    506512        $(VBOX_GL_INCS)
    507 endif
    508 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    509  VBoxOGLpackspu_INSTTYPE.win = none
    510  VBoxOGLpackspu_DEBUG_INSTTYPE.win = both
    511513endif
    512514VBoxOGLpackspu_INTERMEDIATES = \
    … …  
    532534        $(VBOX_PATH_CROGL_GENFILES)/packspu_flush.c \
    533535        $(VBOX_PATH_CROGL_GENFILES)/packspu_beginend.c
    534 VBoxOGLpackspu_SOURCES.win = \
    535         pack/pack.def \
    536         pack/packspu.rc
    537536VBoxOGLpackspu_CLEAN       = \
    538537        $(VBOX_PATH_CROGL_GENFILES)/packspu_proto.h \
    … …  
    541540        $(VBOX_PATH_CROGL_GENFILES)/packspu_flush.c \
    542541        $(VBOX_PATH_CROGL_GENFILES)/packspu_beginend.c
    543 VBoxOGLpackspu_LIBS        = \
    544         $(VBOX_LIB_OGL_CRUTIL) \
    545         $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
    546         $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) \
    547         $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker$(VBOX_SUFF_LIB)
    548542VBoxOGLpackspu_LIBS.win += \
    549543        $(PATH_STAGE_LIB)/additions/VBoxDispMpLogger$(VBOX_SUFF_LIB) \
    … …  
    570564VBoxOGLpackspu-x86_EXTENDS = VBoxOGLpackspu
    571565VBoxOGLpackspu-x86_BLD_TRG_ARCH = x86
    572 VBoxOGLpackspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86) \
    573         $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
    574         $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) \
    575         $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker-x86$(VBOX_SUFF_LIB)
    576566VBoxOGLpackspu-x86_LIBS.win += \
    577567        $(PATH_STAGE_LIB)/additions/VBoxDispMpLogger-x86$(VBOX_SUFF_LIB) \
    … …  
    607597# VBoxOGLfeedbackspu
    608598#
    609 VBoxOGLfeedbackspu_TEMPLATE    = VBOXCROGLR3GUESTDLL
     599VBoxOGLfeedbackspu_TEMPLATE    = VBOXCROGLR3GUESTLIB
    610600VBoxOGLfeedbackspu_INCS        = \
    611601        feedback \
    … …  
    614604 VBoxOGLfeedbackspu_INCS += \
    615605        $(VBOX_GL_INCS)
    616 endif
    617 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    618  VBoxOGLfeedbackspu_INSTTYPE.win = none
    619  VBoxOGLfeedbackspu_DEBUG_INSTTYPE.win = both
    620606endif
    621607VBoxOGLfeedbackspu_INTERMEDIATES = \
    … …  
    627613        $(VBOX_PATH_CROGL_GENFILES)/feedbackspu.c \
    628614        $(VBOX_PATH_CROGL_GENFILES)/feedbackspu_state.c
    629 VBoxOGLfeedbackspu_SOURCES.win = \
    630         feedback/feedback.def \
    631         feedback/feedbackspu.rc
    632615VBoxOGLfeedbackspu_CLEAN       = \
    633616        $(VBOX_PATH_CROGL_GENFILES)/feedbackspu_proto.h \
    … …  
    635618        $(VBOX_PATH_CROGL_GENFILES)/feedbackspu_state.c
    636619VBoxOGLfeedbackspu_LIBS        = \
    637         $(VBOX_LIB_OGL_CRUTIL) \
    638         $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
    639620        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB)
    640621ifdef VBOX_WITH_CRHGSMI
    … …  
    651632VBoxOGLfeedbackspu-x86_EXTENDS = VBoxOGLfeedbackspu
    652633VBoxOGLfeedbackspu-x86_BLD_TRG_ARCH = x86
    653 VBoxOGLfeedbackspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86) \
    654         $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
    655         $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB)
    656634VBoxOGLfeedbackspu-x86_DEFS = $(VBoxOGLfeedbackspu_DEFS) VBOX_WDDM_WOW64
    657635endif

  • trunk/src/VBox/Additions/common/crOpenGL/feedback/feedbackspu_init.c

    r78375 r78408  
    6767}
    6868
    69 int SPULoad( char **name, char **super, SPUInitFuncPtr *init,
    70              SPUSelfDispatchFuncPtr *self, SPUCleanupFuncPtr *cleanup,
    71              int *flags )
     69DECLHIDDEN(const SPUREG) g_FeedbackSpuReg =
    7270{
    73         *name = "feedback";
    74         *super = "passthrough";
    75         *init = feedbackSPUInit;
    76         *self = feedbackSPUSelfDispatch;
    77         *cleanup = feedbackSPUCleanup;
    78         *flags = (SPU_NO_PACKER|SPU_NOT_TERMINAL|SPU_MAX_SERVERS_ZERO);
    79 
    80         return 1;
    81 }
     71    /** pszName. */
     72    "feedback",
     73    /** pszSuperName. */
     74    "passthrough",
     75    /** fFlags. */
     76    SPU_NO_PACKER | SPU_NOT_TERMINAL | SPU_MAX_SERVERS_ZERO,
     77    /** pfnInit. */
     78    feedbackSPUInit,
     79    /** pfnDispatch. */
     80    feedbackSPUSelfDispatch,
     81    /** pfnCleanup. */
     82    feedbackSPUCleanup
     83};

  • trunk/src/VBox/Additions/common/crOpenGL/load.c

    r78341 r78408  
    2727# include <unistd.h>
    2828#endif
     29
     30#include "VBox/VBoxGuestLib.h"
    2931
    3032#ifdef VBOX_WITH_WDDM
    … …  
    782784
    783785    char response[1024];
    784     char **spuchain;
    785     int num_spus;
    786     int *spu_ids;
    787     char **spu_names;
     786    int aSpuIds[] = {0, 1};
     787    const char *apszSpuNames[] = {"feedback", "pack"};
     788    PCSPUREG apSpuReg[] = { &g_ErrorSpuReg, &g_FeedbackSpuReg, &g_PassthroughSpuReg,&g_PackSpuReg};
    788789    const char *app_id;
    789     int i;
    790790    int disable_sync = 0;
    791791#if defined(WINDOWS) && defined(VBOX_WITH_WDDM)
    … …  
    840840    }
    841841#endif
    842 
    843     strcpy(response, "2 0 feedback 1 pack");
    844     spuchain = crStrSplit( response, " " );
    845     num_spus = crStrToInt( spuchain[0] );
    846     spu_ids = (int *) crAlloc( num_spus * sizeof( *spu_ids ) );
    847     spu_names = (char **) crAlloc( num_spus * sizeof( *spu_names ) );
    848     for (i = 0 ; i < num_spus ; i++)
    849     {
    850         spu_ids[i] = crStrToInt( spuchain[2*i+1] );
    851         spu_names[i] = crStrdup( spuchain[2*i+2] );
    852         crDebug( "SPU %d/%d: (%d) \"%s\"", i+1, num_spus, spu_ids[i], spu_names[i] );
    853     }
    854842
    855843    stubSetDefaultConfigurationOptions();
    … …  
    876864#endif
    877865
    878     stub.spu = crSPULoadChain( num_spus, spu_ids, spu_names, stub.spu_dir, NULL );
    879 
    880     crFree( spuchain );
    881     crFree( spu_ids );
    882     for (i = 0; i < num_spus; ++i)
    883         crFree(spu_names[i]);
    884     crFree( spu_names );
     866    stub.spu = crSPUInitChainFromReg(RT_ELEMENTS(aSpuIds), &aSpuIds[0], &apszSpuNames[0], NULL, &apSpuReg[0]);
    885867
    886868    // spu chain load failed somewhere
    … …  
    11821164        GetModuleFileNameA(hDLLInst, aName, RT_ELEMENTS(aName));
    11831165        crDbgCmdSymLoadPrint(aName, hDLLInst);
    1184 
    1185         hCrUtil = GetModuleHandleA("VBoxOGLcrutil.dll");
    1186         Assert(hCrUtil);
    1187         crDbgCmdSymLoadPrint("VBoxOGLcrutil.dll", hCrUtil);
    1188 #endif
     1166#endif
     1167
     1168        int rc = RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE); CRASSERT(rc==0);
     1169        rc = VbglR3Init();
     1170
    11891171        crInitTSD(&g_stubCurrentContextTSD);
    11901172        crInitMutex(&stub_init_mutex);
    … …  
    13351317            vboxVDbgVEHandlerUnregister();
    13361318#endif
     1319        VbglR3Term();
    13371320        break;
    13381321    }

  • trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_init.c

    r78375 r78408  
    5757    (void) self;
    5858
    59 #if !defined(WINDOWS)
    6059    crInitMutex(&_PackMutex);
    61 #endif
    6260
    6361    crInitTSD(&_PackerTSD);
    … …  
    122120    crFreeTSD(&_PackTSD);
    123121    crUnlockMutex(&_PackMutex);
    124 #ifndef WINDOWS
    125122    crFreeMutex(&_PackMutex);
    126 #endif
     123    crNetTearDown(); /** @todo Why here? */
    127124    return 1;
    128125}
    129126
    130 int SPULoad( char **name, char **super, SPUInitFuncPtr *init,
    131          SPUSelfDispatchFuncPtr *self, SPUCleanupFuncPtr *cleanup,
    132          int *flags )
    133 {
    134     *name = "pack";
    135     *super = NULL;
    136     *init = packSPUInit;
    137     *self = packSPUSelfDispatch;
    138     *cleanup = packSPUCleanup;
    139     *flags = (SPU_HAS_PACKER|SPU_IS_TERMINAL|SPU_MAX_SERVERS_ONE);
    140 
    141     return 1;
    142 }
     127DECLHIDDEN(const SPUREG) g_PackSpuReg =
     128 {
     129    /** pszName. */
     130    "pack",
     131    /** pszSuperName. */
     132    NULL,
     133    /** fFlags. */
     134    SPU_HAS_PACKER | SPU_IS_TERMINAL | SPU_MAX_SERVERS_ONE,
     135    /** pfnInit. */
     136    packSPUInit,
     137    /** pfnDispatch. */
     138    packSPUSelfDispatch,
     139    /** pfnCleanup. */
     140    packSPUCleanup
     141};

  • trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_misc.c

    r78375 r78408  
    704704}
    705705
    706 #ifdef WINDOWS
    707 #define WIN32_LEAN_AND_MEAN
    708 #include <windows.h>
    709 BOOL WINAPI DllMain(HINSTANCE hDLLInst, DWORD fdwReason, LPVOID lpvReserved)
    710 {
    711     (void) lpvReserved;
    712 
    713     switch (fdwReason)
    714     {
    715         case DLL_PROCESS_ATTACH:
    716         {
    717             crInitMutex(&_PackMutex);
    718             break;
    719         }
    720 
    721         case DLL_PROCESS_DETACH:
    722         {
    723             crFreeMutex(&_PackMutex);
    724             crNetTearDown();
    725             break;
    726         }
    727 
    728         case DLL_THREAD_ATTACH:
    729         case DLL_THREAD_DETACH:
    730         default:
    731             break;
    732     }
    733 
    734     return TRUE;
    735 }
    736 #endif
    737 
    738706void PACKSPU_APIENTRY packspu_VBoxPresentComposition(GLint win, const struct VBOXVR_SCR_COMPOSITOR * pCompositor,
    739707                                                     const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry)

  • trunk/src/VBox/Additions/common/crOpenGL/passthrough/passthroughspu_init.c

    r78190 r78408  
    4545
    4646
    47 int SPULoad( char **name, char **super, SPUInitFuncPtr *init,
    48              SPUSelfDispatchFuncPtr *self, SPUCleanupFuncPtr *cleanup,
    49              int *flags )
     47DECLHIDDEN(const SPUREG) g_PassthroughSpuReg =
    5048{
    51         *name = "passthrough";
    52         *super = NULL;
    53         *init = passthroughSPUInit;
    54         *self = passthroughSPUSelfDispatch;
    55         *cleanup = passthroughSPUCleanup;
    56         *flags = (SPU_NO_PACKER|SPU_NOT_TERMINAL|SPU_MAX_SERVERS_ZERO);
    57 
    58         return 1;
    59 }
     49    /** pszName. */
     50    "passthrough",
     51    /** pszSuperName. */
     52    NULL,
     53    /** fFlags. */
     54    SPU_NO_PACKER | SPU_NOT_TERMINAL | SPU_MAX_SERVERS_ZERO,
     55    /** pfnInit. */
     56    passthroughSPUInit,
     57    /** pfnDispatch. */
     58    passthroughSPUSelfDispatch,
     59    /** pfnCleanup. */
     60    passthroughSPUCleanup
     61};

  • trunk/src/VBox/Additions/freebsd/Makefile.kmk

    r78340 r78408  
    6868        vboxvideo_drv_16.so \
    6969        vboxvideo_drv_17.so \
    70         VBoxOGLcrutil.so \
    71         VBoxOGLerrorspu.so \
    72         VBoxOGLfeedbackspu.so \
    73         VBoxOGLpackspu.so \
    74         VBoxOGLpassthroughspu.so \
    7570        VBoxOGL.so
    7671

  • trunk/src/VBox/Additions/linux/Makefile.kmk

    r78340 r78408  
    125125ifdef VBOX_WITH_CROGL
    126126VBOX_LNX_ADD_STRIP_LIB += \
    127         VBoxOGLcrutil.so \
    128         VBoxOGLerrorspu.so \
    129         VBoxOGLfeedbackspu.so \
    130         VBoxOGLpackspu.so \
    131         VBoxOGLpassthroughspu.so \
    132127        VBoxOGL.so \
    133128        VBoxEGL.so

  • trunk/src/VBox/Additions/solaris/Makefile.kmk

    r78340 r78408  
    170170
    171171SOLARIS_ADD_SYSLIBS = \
    172         VBoxOGL.so \
    173         VBoxOGLcrutil.so \
    174         VBoxOGLfeedbackspu.so \
    175         VBoxOGLpassthroughspu.so \
    176         VBoxOGLerrorspu.so \
    177         VBoxOGLpackspu.so
     172        VBoxOGL.so
    178173
    179174SOLARIS_ADD_DRIVERS = \

  • trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

    r78190 r78408  
    3434
    3535ifdef VBOX_WITH_CROGL_ADDITIONS
    36  DLLS      += VBoxOGLcrutil VBoxOGLerrorspu
    37  LIBRARIES += VBoxOGLcrpacker VBoxOGLspuload VBoxOGLcrstate
     36 LIBRARIES += VBoxOGLcrpacker VBoxOGLspuload VBoxOGLcrstate VBoxOGLcrutil VBoxOGLerrorspu
    3837endif
    3938
    4039ifndef VBOX_ONLY_ADDITIONS
    41  DLLS      += VBoxOGLhostcrutil VBoxOGLhosterrorspu
    42  LIBRARIES += VBoxOGLhostcrpacker VBoxOGLhostspuload VBoxOGLhostcrstate
     40 LIBRARIES += VBoxOGLhostcrpacker VBoxOGLhostspuload VBoxOGLhostcrstate VBoxOGLhostcrutil VBoxOGLhosterrorspu
    4341endif
    4442
    … …  
    4644# VBoxOGLcrutil
    4745#
    48 VBoxOGLcrutil_TEMPLATE      = VBOXCROGLR3GUESTDLL
     46VBoxOGLcrutil_TEMPLATE      = VBOXCROGLR3GUESTLIB
    4947if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    5048 VBoxOGLcrutil_INSTTYPE.win = none
    … …  
    7775        util/bmpscale.cpp \
    7876        util/vboxhgcm.c
    79 VBoxOGLcrutil_SOURCES.win = \
    80         util/VBoxOGLcrutil.rc
    81 VBoxOGLcrutil_SOURCES.win.x86 = \
    82         util/util.def
    8377VBoxOGLcrutil_LIBS.win = \
    8478        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
    … …  
    120114# VBoxOGLcrutil-x86 - x86 VBoxOGLcrutil version built for amd64 build
    121115#
    122 DLLS.win.amd64 += VBoxOGLcrutil-x86
    123 VBoxOGLcrutil-x86_TEMPLATE      = VBOXCROGLR3GUESTDLL
     116LIBRARIES.win.amd64 += VBoxOGLcrutil-x86
     117VBoxOGLcrutil-x86_TEMPLATE      = VBOXCROGLR3GUESTLIB
    124118VBoxOGLcrutil-x86_EXTENDS = VBoxOGLcrutil
    125119VBoxOGLcrutil-x86_BLD_TRG_ARCH = x86
    … …  
    150144#
    151145VBoxOGLhostcrutil_EXTENDS  = VBoxOGLcrutil
    152 VBoxOGLhostcrutil_TEMPLATE = VBOXCROGLR3HOSTDLL
     146VBoxOGLhostcrutil_TEMPLATE = VBOXCROGLR3HOSTLIB
    153147if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    154148 VBoxOGLhostcrutil_INSTTYPE.win = both
    … …  
    157151VBoxOGLhostcrutil_LDFLAGS = $(NO_SUCH_VARIABLE)
    158152endif
    159 VBoxOGLhostcrutil_LDFLAGS.darwin = $(VBoxOGLcrutil_LDFLAGS.darwin) \
    160         -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxOGLhostcrutil.dylib
    161153VBoxOGLhostcrutil_LIBS.win =  \
    162154    $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
    … …  
    470462ifdef VBOX_WITH_CRDUMPER
    471463VBoxOGLcrstate_DEFS        += VBOX_WITH_CRDUMPER
    472 #VBoxOGLcrutil_LIBS        += \
    473     $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) \
    474     $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
    475464endif
    476465
    … …  
    567556#         and glu.h intermediate files on darwin.
    568557#
    569 VBoxOGLerrorspu_TEMPLATE = VBOXCROGLR3GUESTDLL
    570 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    571  VBoxOGLerrorspu_INSTTYPE.win = none
    572  VBoxOGLerrorspu_DEBUG_INSTTYPE.win = both
    573 endif
     558VBoxOGLerrorspu_TEMPLATE = VBOXCROGLR3GUESTLIB
    574559VBoxOGLerrorspu_INTERMEDIATES = \
    575560        $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h
    … …  
    583568        $(VBOX_PATH_CROGL_GENFILES)/errorspu.c \
    584569        error/errorspu_init.c
    585 VBoxOGLerrorspu_SOURCES.win = \
    586         error/VBoxOGLerrorspu.rc
    587 VBoxOGLerrorspu_SOURCES.win.x86 = \
    588         error/error.def
    589570VBoxOGLerrorspu_CLEAN = \
    590571        $(VBOX_PATH_CROGL_GENFILES)/errorspu.c
    … …  
    603584# VBoxOGLerrorspu-x86 - x86 VBoxOGLerrorspu version built for amd64 build
    604585#
    605 DLLS.win.amd64 += VBoxOGLerrorspu-x86
    606 VBoxOGLerrorspu-x86_TEMPLATE = VBOXCROGLR3GUESTDLL
     586LIBRARIES.win.amd64 += VBoxOGLerrorspu-x86
     587VBoxOGLerrorspu-x86_TEMPLATE = VBOXCROGLR3GUESTLIB
    607588VBoxOGLerrorspu-x86_EXTENDS = VBoxOGLerrorspu
    608589VBoxOGLerrorspu-x86_BLD_TRG_ARCH = x86
    … …  
    616597#
    617598VBoxOGLhosterrorspu_EXTENDS  = VBoxOGLerrorspu
    618 VBoxOGLhosterrorspu_TEMPLATE = VBOXCROGLR3HOSTDLL
     599VBoxOGLhosterrorspu_TEMPLATE = VBOXCROGLR3HOSTLIB
    619600if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    620601 VBoxOGLhosterrorspu_INSTTYPE.win = both
    621602endif
    622 VBoxOGLhosterrorspu_LDFLAGS.darwin += $(VBoxOGLerrorspu_LDFLAGS.darwin) \
    623         -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxOGLhosterrorspu.dylib
    624 VBoxOGLhosterrorspu_LIBS  = \
    625         $(VBOX_LIB_OGL_HOSTCRUTIL) \
    626         $(LIB_RUNTIME)
    627603
    628604#

  • trunk/src/VBox/GuestHost/OpenGL/error/errorspu_init.c

    r78190 r78408  
    3939
    4040
    41 int SPULoad( char **name, char **super, SPUInitFuncPtr *init,
    42              SPUSelfDispatchFuncPtr *self, SPUCleanupFuncPtr *cleanup,
    43              int *flags )
     41DECLHIDDEN(const SPUREG) g_ErrorSpuReg =
    4442{
     43    /** pszName. */
    4544#ifdef IN_GUEST
    46         *name = "error";
     45    "error",
    4746#else
    48         *name = "hosterror";
     47    "hosterror",
    4948#endif
    50         *super = NULL;
    51         *init = errorSPUInit;
    52         *self = errorSPUSelfDispatch;
    53         *cleanup = errorSPUCleanup;
    54         *flags = (SPU_NO_PACKER|SPU_NOT_TERMINAL|SPU_MAX_SERVERS_ZERO);
    55        
    56         return 1;
    57 }
     49    /** pszSuperName. */
     50    NULL,
     51    /** fFlags. */
     52    SPU_NO_PACKER | SPU_NOT_TERMINAL | SPU_MAX_SERVERS_ZERO,
     53    /** pfnInit. */
     54    errorSPUInit,
     55    /** pfnDispatch. */
     56    errorSPUSelfDispatch,
     57    /** pfnCleanup. */
     58    errorSPUCleanup
     59};

  • trunk/src/VBox/GuestHost/OpenGL/include/cr_spu.h

    r78263 r78408  
    7676#define SPU_MAX_SERVERS_UNLIMITED 0x8
    7777
     78/**
     79 * SPU registration restructure.
     80 */
     81typedef struct SPUREG
     82{
     83    /** SPU name. */
     84    const char             *pszName;
     85    /** Name of the SPU super class. */
     86    const char             *pszSuperName;
     87    /** SPU flags. */
     88    uint32_t               fFlags;
     89    /** Init function. */
     90    SPUInitFuncPtr         pfnInit;
     91    /** Dispatch function. */
     92    SPUSelfDispatchFuncPtr pfnDispatch;
     93    /** Cleanup function. */
     94    SPUCleanupFuncPtr      pfnCleanup;
     95} SPUREG;
     96/** Pointer to a SPU registration structure. */
     97typedef SPUREG *PSPUREG;
     98/** Pointer to a const SPU registration structure. */
     99typedef const SPUREG *PCSPUREG;
    78100
    79101/**
    … …  
    346368DECLEXPORT(void) crSPUUnloadChain(SPU *headSPU);
    347369
     370DECLEXPORT(SPU *) crSPUInitFromReg(SPU *pSpuChild, int iId, const char *pszName, void *pvServer, PCSPUREG *papSpuReg);
     371DECLEXPORT(SPU *) crSPUInitChainFromReg(int cSpus, int *paIds, const char * const *papszNames, void *server, PCSPUREG *papSpuReg);
     372
    348373DECLEXPORT(void) crSPUInitDispatchTable( SPUDispatchTable *table );
    349374DECLEXPORT(void) crSPUCopyDispatchTable( SPUDispatchTable *dst, SPUDispatchTable *src );
    … …  
    378403#endif
    379404
     405extern DECLHIDDEN(const SPUREG) g_ErrorSpuReg;
     406#ifdef IN_GUEST
     407extern DECLHIDDEN(const SPUREG) g_FeedbackSpuReg;
     408extern DECLHIDDEN(const SPUREG) g_PassthroughSpuReg;
     409extern DECLHIDDEN(const SPUREG) g_PackSpuReg;
     410#else
     411extern DECLHIDDEN(const SPUREG) g_RenderSpuReg;
     412#endif
     413
    380414#ifdef __cplusplus
    381415}

  • trunk/src/VBox/GuestHost/OpenGL/include/cr_threads.h

    r69474 r78408  
    110110#define VBoxTlsRefSetImpl(_tls, _val) (crSetTSD((CRtsd*)(_tls), (_val)))
    111111#define VBoxTlsRefAssertImpl CRASSERT
    112 #include <VBoxVideo3D.h>
     112#include <VBox/Graphics/VBoxVideo3D.h>
    113113
    114114#ifdef __cplusplus

  • trunk/src/VBox/GuestHost/OpenGL/spu_loader/spuload.c

    r78190 r78408  
    220220
    221221
     222/**
     223 * Returns the SPU registration record for the given name.
     224 *
     225 * @returns Pointer to the SPU registration record on success or NULL if not found.
     226 * @param   pszName             The name to look for.
     227 * @param   papSpuReg           Pointer to the NULL terminated array of builtin SPU registration record pointers.
     228 */
     229PCSPUREG crSPUGetRegFromName(const char *pszName, PCSPUREG *papSpuReg)
     230{
     231    while (*papSpuReg)
     232    {
     233        if (!RTStrCmp(pszName, (*papSpuReg)->pszName))
     234            return *papSpuReg;
     235        papSpuReg++;
     236    }
     237
     238    return NULL;
     239}
     240
     241
     242/**
     243 * Creates a SPU chain from the given SPU registration structure (VBox only).
     244 *
     245 * @returns Pointer to the SPU head in the chain on success.
     246 * @param   pSpuChild           Pointer to the child SPU if any.
     247 * @param   iId                 ID to assign to the head SPU.
     248 * @param   pszName             Name of the SPU to initialize.
     249 * @param   pvServer            The server owning the SPU chain.
     250 * @param   papSpuReg           Pointer to the NULL terminated array of builtin SPU registration record pointers.
     251 */
     252SPU * crSPUInitFromReg(SPU *pSpuChild, int iId, const char *pszName, void *pvServer, PCSPUREG *papSpuReg)
     253{
     254    SPU *pSpu;
     255    bool fNeedSuperSPU = false;
     256    PCSPUREG pSpuReg = crSPUGetRegFromName(pszName, papSpuReg);
     257    AssertPtrReturn(pSpuReg, NULL);
     258
     259    pSpu = (SPU*)crAlloc(sizeof(*pSpu));
     260    crMemset(pSpu, 0, sizeof (*pSpu));
     261    pSpu->id = iId;
     262    pSpu->privatePtr = NULL;
     263
     264    /* Init the SPU structure from the SPU registration record. */
     265    pSpu->name       = (char *)pSpuReg->pszName;
     266    pSpu->super_name = (char *)pSpuReg->pszSuperName;
     267    pSpu->init       = pSpuReg->pfnInit;
     268    pSpu->self       = pSpuReg->pfnDispatch;
     269    pSpu->cleanup    = pSpuReg->pfnCleanup;
     270    pSpu->spu_flags  = pSpuReg->fFlags;
     271
     272#ifdef IN_GUEST
     273    if (crStrcmp(pSpu->name,"error"))
     274    {
     275            /* the default super/base class for an SPU is the error SPU */
     276            if (pSpu->super_name == NULL)
     277                pSpu->super_name = "error";
     278
     279            pSpu->superSPU = crSPUInitFromReg(pSpuChild, iId, pSpu->super_name, pvServer, papSpuReg);
     280            fNeedSuperSPU = true;
     281    }
     282#else
     283    if (crStrcmp(pSpu->name,"hosterror"))
     284    {
     285            /* the default super/base class for an SPU is the error SPU */
     286            if (pSpu->super_name == NULL)
     287                pSpu->super_name = "hosterror";
     288
     289            pSpu->superSPU = crSPUInitFromReg(pSpuChild, iId, pSpu->super_name, pvServer, papSpuReg);
     290            fNeedSuperSPU = true;
     291    }
     292#endif
     293    else
     294        pSpu->superSPU = NULL;
     295
     296    if (fNeedSuperSPU && !pSpu->superSPU)
     297    {
     298            crError( "Unable to load super SPU \"%s\" of \"%s\"!", pSpu->super_name, pSpuReg->pszName);
     299            crSPUUnloadChain(pSpu);
     300            return NULL;
     301    }
     302    crDebug("Initializing %s SPU", pSpuReg->pszName);
     303    pSpu->function_table = pSpu->init(iId, pSpuChild, pSpu, 0, 1);
     304    if (!pSpu->function_table) {
     305            crDebug("Failed to init %s SPU", pSpuReg->pszName);
     306            crSPUUnloadChain(pSpu);
     307            return NULL;
     308    }
     309    __buildDispatch( pSpu );
     310    /*crDebug( "initializing dispatch table %p (for SPU %s)", (void*)&(pSpu->dispatch_table), name );*/
     311    crSPUInitDispatchTable( &(pSpu->dispatch_table) );
     312    /*crDebug( "Done initializing the dispatch table for SPU %s, calling the self function", name );*/
     313
     314    pSpu->dispatch_table.server = pvServer;
     315    pSpu->self( &(pSpu->dispatch_table) );
     316    /*crDebug( "Done with the self function" );*/
     317
     318    return pSpu;
     319}
     320
     321
     322/**
     323 * Initializes a give nchain of SPUs from the builtin SPU registration descriptors (VBox only).
     324 *
     325 * @returns Pointer to the Head SPU on success or NULL on failure.
     326 * @param   cSpus               The number of SPUs to initialize.
     327 * @param   paIds               Pointer to the array of IDs.
     328 * @param   papszNames          Pointer to the array of SPU names to initalize.
     329 * @param   pvServer            The server owning the SPU chain.
     330 * @param   papSpuReg           Pointer to the NULL terminated array of builtin SPU registration record pointers.
     331 */
     332SPU *crSPUInitChainFromReg(int cSpus, int *paIds, const char * const *papszNames, void *pvServer, PCSPUREG *papSpuReg)
     333{
     334    int i = 0;
     335    SPU *pSpuChild = NULL;
     336    CRASSERT( cSpus > 0 );
     337
     338    for (i = cSpus - 1; i >= 0; i--)
     339    {
     340        int idSpu = paIds[i];
     341        const char *pszSpuName = papszNames[i];
     342
     343        /*
     344         * This call passes the previous version of spu, which is the SPU's
     345         * "child" in this chain.
     346         */
     347        SPU *pSpu = crSPUInitFromReg( pSpuChild, idSpu, pszSpuName, pvServer, papSpuReg);
     348        if (!pSpu)
     349            return NULL; /** @todo Proper rollback. */
     350
     351        if (pSpuChild != NULL)
     352        {
     353            SPU *pTmp;
     354
     355            /* keep track of this so that people can pass functions through but
     356             * still get updated when API's change on the fly. */
     357            for (pTmp = pSpu ; pTmp ; pTmp = pTmp->superSPU )
     358            {
     359                struct _copy_list_node *node = (struct _copy_list_node *) crAlloc( sizeof( *node ) );
     360                node->copy = &(pTmp->dispatch_table);
     361                node->next = pSpuChild->dispatch_table.copyList;
     362                pSpuChild->dispatch_table.copyList = node;
     363            }
     364        }
     365        pSpuChild = pSpu;
     366    }
     367
     368    return pSpuChild;
     369}
     370
     371
    222372#if 00
    223373/* XXXX experimental code - not used at this time */
    … …  
    282432
    283433                next_spu = the_spu->superSPU;
    284                 crDLLClose(the_spu->dll);
     434                if (the_spu->dll != NULL)
     435                    crDLLClose(the_spu->dll);
    285436                crFree(the_spu);
    286437                the_spu = next_spu;

  • trunk/src/VBox/GuestHost/OpenGL/util/error.c

    r78190 r78408  
    3131#ifdef RT_OS_WINDOWS
    3232# include <iprt/win/windows.h>
    33 # include "cr_error.h"
    34 # include "VBox/VBoxGuestLib.h"
    35 # include "iprt/initterm.h"
    36 #else
    37 # include "cr_error.h"
    3833#endif
     34#include "cr_error.h"
    3935
    4036#include <signal.h>
    … …  
    179175    }
    180176}
    181 
    182 #if defined(RT_OS_WINDOWS)
    183 BOOL WINAPI DllMain(HINSTANCE hDLLInst, DWORD fdwReason, LPVOID lpvReserved)
    184 {
    185     (void) lpvReserved; (void) hDLLInst;
    186 
    187     switch (fdwReason)
    188     {
    189         case DLL_PROCESS_ATTACH:
    190         {
    191             int rc;
    192             rc = RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE); CRASSERT(rc==0);
    193 # ifdef IN_GUEST
    194             rc = VbglR3Init();
    195 # endif
    196             LogRel(("crUtil DLL loaded.\n"));
    197 # if defined(DEBUG_misha)
    198             char aName[MAX_PATH];
    199             GetModuleFileNameA(hDLLInst, aName, RT_ELEMENTS(aName));
    200             crDbgCmdSymLoadPrint(aName, hDLLInst);
    201 # endif
    202              break;
    203         }
    204 
    205         case DLL_PROCESS_DETACH:
    206         {
    207             LogRel(("crUtil DLL unloaded."));
    208 # ifdef IN_GUEST
    209             VbglR3Term();
    210 # endif
    211         }
    212 
    213         default:
    214             break;
    215     }
    216 
    217     return TRUE;
    218 }
    219 #endif
    220 

  • trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

    r78192 r78408  
    2424#
    2525ifdef VBOX_WITH_MAIN
    26 DLLS      += VBoxSharedCrOpenGL VBoxOGLrenderspu
    27 LIBRARIES += VBoxOGLcrserverlib VBoxOGLcrunpacker
     26DLLS      += VBoxSharedCrOpenGL
     27LIBRARIES += VBoxOGLcrserverlib VBoxOGLcrunpacker VBoxOGLrenderspu
    2828BLDDIRS   += \
    2929        $(VBOX_PATH_CROGL_GENFILES)/
    … …  
    7272        $(PATH_STAGE_LIB)/VBoxOGLhostcrpacker$(VBOX_SUFF_LIB) \
    7373        $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
    74         $(VBOX_LIB_OGL_HOSTCRUTIL) \
     74        $(PATH_STAGE_LIB)/VBoxOGLhostcrutil$(VBOX_SUFF_LIB) \
     75        $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
     76        $(PATH_STAGE_LIB)/VBoxOGLrenderspu$(VBOX_SUFF_LIB) \
     77        $(PATH_STAGE_LIB)/VBoxOGLhosterrorspu$(VBOX_SUFF_LIB) \
    7578        $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
    7679        $(LIB_RUNTIME) \
    … …  
    7881VBoxSharedCrOpenGL_LIBS.darwin = \
    7982        $(LIB_REM)
    80 ifeq ($(KBUILD_TARGET),win)
    81  VBoxSharedCrOpenGL_LIBS += \
    82         $(PATH_OBJ)/VBoxOGLrenderspu/VBoxOGLrenderspu$(VBOX_SUFF_LIB)
    83 else
    84  VBoxSharedCrOpenGL_LIBS += \
    85         $(PATH_STAGE_BIN)/VBoxOGLrenderspu$(VBOX_SUFF_DLL)
    86 endif
    8783ifdef VBOX_WITH_XPCOM
    8884 VBoxSharedCrOpenGL_LIBS += \
    … …  
    260256# VBoxOGLrenderspu
    261257#
    262 VBoxOGLrenderspu_TEMPLATE = VBOXCROGLR3HOSTDLL
     258VBoxOGLrenderspu_TEMPLATE = VBOXCROGLR3HOSTLIB
    263259VBoxOGLrenderspu_INTERMEDIATES = \
    264260        $(VBOX_PATH_CROGL_GENFILES)/state/cr_currentpointers.h \
    … …  
    270266        render/renderspu_init.c
    271267VBoxOGLrenderspu_SOURCES.win     = \
    272         render/renderspu_wgl.c \
    273         render/render.def \
    274         render/VBoxOGLrenderspu.rc
     268        render/renderspu_wgl.c
    275269VBoxOGLrenderspu_SOURCES.linux   = render/renderspu_glx.c
    276270VBoxOGLrenderspu_SOURCES.solaris = render/renderspu_glx.c
    … …  
    287281VBoxOGLrenderspu_DEFS += VBOX_WITH_VDMA
    288282endif
    289 VBoxOGLrenderspu_LDFLAGS.darwin += -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxOGLrenderspu.dylib -framework IOKit
    290 VBoxOGLrenderspu_LIBS = \
    291         $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
    292         $(VBOX_LIB_OGL_HOSTCRUTIL) \
    293         $(LIB_RUNTIME)
    294283if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # the X11 gang
    295284 VBoxOGLrenderspu_LIBS += \
    … …  
    321310  PROGRAMS += VBoxTestOGL
    322311  VBoxTestOGL_TEMPLATE = $(if $(VBOX_WITH_VIDEOHWACCEL),$(if $(VBOX_WITH_HARDENING),VBOXQTGUI,VBOXQTGUIEXE),VBOXMAINEXE)
     312  VBoxTestOGL_INCS     += $(VBOX_PATH_CROGL_INCLUDE) $(VBOX_PATH_CROGL_GENFILES)
     313  VBoxTestOGL_DEFS.win         = _WIN32_WINNT=0x0500 WINDOWS=1
     314  VBoxTestOGL_DEFS.linux       = Linux=1 _GNU_SOURCE
     315  VBoxTestOGL_DEFS.solaris     = SunOS=1 _GNU_SOURCE #GLEXT_64_TYPES_DEFINED
     316  VBoxTestOGL_DEFS.darwin      = DARWIN=1 GL_GLEXT_LEGACY _GNU_SOURCE
     317  VBoxTestOGL_DEFS.freebsd     = FreeBSD=1 _GNU_SOURCE
    323318  VBoxTestOGL_SOURCES = OpenGLTest/OpenGLTestApp.cpp
    324319  VBoxTestOGL_SOURCES.win = OpenGLTest/VBoxTestOGL.rc
    … …  
    326321        $(if $(VBOX_WITH_CROGL), \
    327322            $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
    328             $(VBOX_LIB_OGL_HOSTCRUTIL),) \
     323            $(PATH_STAGE_LIB)/VBoxOGLhosterrorspu$(VBOX_SUFF_LIB) \
     324            $(PATH_STAGE_LIB)/VBoxOGLrenderspu$(VBOX_SUFF_LIB) \
     325            $(PATH_STAGE_LIB)/VBoxOGLhostcrutil$(VBOX_SUFF_LIB),) \
    329326        $(if $(VBOX_WITH_VIDEOHWACCEL), $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB),) \
    330327        $(LIB_RUNTIME)

  • trunk/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp

    r77557 r78408  
    5151#ifdef VBOX_WITH_CROGL
    5252
    53 extern "C"
    54 {
    55   extern void * crSPULoad(void *, int, char *, char *, void *);
    56   extern void crSPUUnloadChain(void *);
    57 }
    58 
     53#include <cr_spu.h>
    5954
    6055static int vboxCheck3DAccelerationSupported()
    6156{
    6257    LogRel(("Testing 3D Support:\n"));
    63     void *spu = crSPULoad(NULL, 0, (char*)"render", NULL, NULL);
     58    PCSPUREG aSpuRegs[] = { &g_RenderSpuReg, &g_ErrorSpuReg, NULL};
     59    SPU *spu = crSPUInitFromReg(NULL, 0, "render", NULL, &aSpuRegs[0]);
    6460    if (spu)
    6561    {

  • trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_config.cpp

    r78190 r78408  
    9999{
    100100    CRMuralInfo *defaultMural;
    101 
    102     int spu_ids[1]     = {0};
    103     char *spu_names[1] = {"render"};
    104     char *spu_dir = NULL;
    105101    int i;
    106102    GLint dims[4];
    … …  
    114110    setDefaults();
    115111   
    116     /* Load the SPUs */   
    117     cr_server.head_spu = crSPULoadChain(1, spu_ids, spu_names, spu_dir, &cr_server);
    118 
     112    /* Load the SPUs */
     113    PCSPUREG aSpuRegs[] = { &g_RenderSpuReg, &g_ErrorSpuReg, NULL};
     114    cr_server.head_spu = crSPUInitFromReg(NULL, 0, "render", &cr_server, &aSpuRegs[0]);
    119115    if (!cr_server.head_spu)
    120116        return;

  • trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.h

    r78341 r78408  
    411411extern "C" {
    412412#endif
    413 DECLEXPORT(void) renderspuSetWindowId(uint64_t winId);
     413DECLHIDDEN(void) renderspuSetWindowId(uint64_t winId);
    414414DECLEXPORT(void) renderspuReparentWindow(GLint window);
    415415DECLEXPORT(void) renderspuSetUnscaledHiDPI(bool fEnable);

  • trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_init.c

    r78341 r78408  
    498498
    499499
    500 int SPULoad( char **name, char **super, SPUInitFuncPtr *init,
    501          SPUSelfDispatchFuncPtr *self, SPUCleanupFuncPtr *cleanup,
    502          int *flags )
    503 {
    504     *name = "render";
    505     *super = NULL;
    506     *init = renderSPUInit;
    507     *self = renderSPUSelfDispatch;
    508     *cleanup = renderSPUCleanup;
    509     *flags = (SPU_NO_PACKER|SPU_IS_TERMINAL|SPU_MAX_SERVERS_ZERO);
    510 
    511     return 1;
    512 }
    513 
    514 DECLEXPORT(void) renderspuSetWindowId(uint64_t winId)
     500DECLHIDDEN(void) renderspuSetWindowId(uint64_t winId)
    515501{
    516502    render_spu_parent_window_id = winId;
    517503    crDebug("Set new parent window %p (no actual reparent performed)", winId);
    518504}
     505
     506DECLHIDDEN(const SPUREG) g_RenderSpuReg =
     507{
     508    /** pszName. */
     509    "render",
     510    /** pszSuperName. */
     511    NULL,
     512    /** fFlags. */
     513    SPU_NO_PACKER | SPU_IS_TERMINAL | SPU_MAX_SERVERS_ZERO,
     514    /** pfnInit. */
     515    renderSPUInit,
     516    /** pfnDispatch. */
     517    renderSPUSelfDispatch,
     518    /** pfnCleanup. */
     519    renderSPUCleanup
     520};

  • trunk/src/VBox/Installer/darwin/Makefile.kmk

    r77769 r78408  
    391391ifdef VBOX_WITH_CROGL
    392392 VBOX_DI_VBAPP_DYLIBS += \
    393         MacOS/VBoxOGLhostcrutil.dylib \
    394         MacOS/VBoxOGLhosterrorspu.dylib \
    395         MacOS/VBoxOGLrenderspu.dylib \
    396393        MacOS/VBoxSharedCrOpenGL.dylib
    397 
    398  ifdef VBOX_WITH_CR_DISPLAY_LISTS
    399   VBOX_DI_VBAPP_DYLIBS += \
    400         MacOS/VBoxOGLexpandospu.dylib
    401  endif
    402394endif
    403395ifdef VBOX_WITH_DEBUGGER_GUI

  • trunk/src/VBox/Installer/freebsd/Makefile.kmk

    r76553 r78408  
    105105                components/VBoxC.so,) \
    106106        $(if $(VBOX_WITH_CROGL),\
    107                 VBoxOGLhostcrutil.so \
    108                 VBoxOGLhosterrorspu.so \
    109                 VBoxOGLrenderspu.so \
    110107                VBoxTestOGL \
    111108                VBoxSharedCrOpenGL.so,) \

  • trunk/src/VBox/Installer/linux/Makefile.kmk

    r76818 r78408  
    168168                components/VBoxC.so,) \
    169169        $(if $(VBOX_WITH_CROGL),\
    170                 VBoxOGLhostcrutil.so \
    171                 VBoxOGLhosterrorspu.so \
    172                 VBoxOGLrenderspu.so \
    173170                $(if $(VBOX_WITH_QTGUI),VBoxTestOGL,) \
    174171                VBoxSharedCrOpenGL.so,) \

  • trunk/src/VBox/Installer/solaris/Makefile.kmk

    r76818 r78408  
    336336        $(if $(VBOX_WITH_DEBUGGER_GUI),VBoxDbg.so DbgPlugInDiggers.so,) \
    337337        $(if $(VBOX_WITH_CROGL),\
    338           VBoxOGLhostcrutil.so \
    339           VBoxOGLhosterrorspu.so \
    340           VBoxOGLrenderspu.so \
    341338          VBoxSharedCrOpenGL.so) \
    342339        components/VBoxC.so \

  • trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

    r76818 r78408  
    409409<?if $(env.VBOX_WITH_CROGL) = "yes" ?>
    410410    <Component Id="cp_VBoxCROpenGL" Guid="874A1297-835A-491D-8A9D-7E723BC29EE7" Win64="$(var.Property_Win64)">
    411         <File Id="file_VBoxOGLhostcrutil.dll" Name="VBoxOGLhostcrutil.dll"
    412               Source="$(env.PATH_OUT)\bin\VBoxOGLhostcrutil.dll" />
    413         <File Id="file_VBoxOGLhosterrorspu.dll" Name="VBoxOGLhosterrorspu.dll"
    414               Source="$(env.PATH_OUT)\bin\VBoxOGLhosterrorspu.dll" />
    415         <File Id="file_VBoxOGLrenderspu.dll" Name="VBoxOGLrenderspu.dll"
    416               Source="$(env.PATH_OUT)\bin\VBoxOGLrenderspu.dll" />
    417411        <File Id="file_VBoxSharedCrOpenGL.dll" Name="VBoxSharedCrOpenGL.dll"
    418412              Source="$(env.PATH_OUT)\bin\VBoxSharedCrOpenGL.dll" />
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