Changeset 78340 in vbox for trunk/src/VBox/Additions

Timestamp:

Apr 28, 2019 3:23:27 PM (6 years ago)

Author:

vboxsync

Message:

Additions: Remove the VBoxOGLarrayspu library as it is unused for a long time already bugref:9435

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Graphics/Video/Makefile.kmk (modified) (6 diffs)
• WINNT/Graphics/Video/mp/wddm/VBoxWddm.inf (modified) (3 diffs)
• WINNT/Installer/Makefile.kmk (modified) (3 diffs)
• WINNT/Installer/VBoxGuestAdditionsCommon.nsh (modified) (4 diffs)
• WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh (modified) (8 diffs)
• common/VBoxService/VBoxServiceVMInfo-win.cpp (modified) (2 diffs)
• common/crOpenGL/.scm-settings (modified) (1 diff)
• common/crOpenGL/Makefile.kmk (modified) (4 diffs)
• common/crOpenGL/array (deleted)
• freebsd/Makefile.kmk (modified) (1 diff)
• linux/Makefile.kmk (modified) (1 diff)
• linux/installer/deffiles (modified) (1 diff)
• solaris/Makefile.kmk (modified) (1 diff)

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

@@ -106 +106 @@
         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm.dll \
         $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm.dll \
-        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu.dll \
         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil.dll \
         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu.dll \
@@ -116 +115 @@
         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm-x86.dll \
         $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm-x86.dll \
-        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu-x86.dll \
         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil-x86.dll \
         $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu-x86.dll \
@@ -185 +183 @@
         $(INSTALL) -m 644 $< $(@D)
 
-  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu.dll: $(PATH_OBJ)/VBoxOGLarrayspu/VBoxOGLarrayspu.dll | $$(dir $$@)
-        $(INSTALL) -m 644 $< $(@D)
-
   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil.dll: $(PATH_OBJ)/VBoxOGLcrutil/VBoxOGLcrutil.dll | $$(dir $$@)
         $(INSTALL) -m 644 $< $(@D)
@@ -211 +206 @@
 
    $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm-x86.dll: $(PATH_OBJ)/wined3dwddm-x86/wined3dwddm-x86.dll | $$(dir $$@)
-        $(INSTALL) -m 644 $< $(@D)
-
-   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu-x86.dll: $(PATH_OBJ)/VBoxOGLarrayspu-x86/VBoxOGLarrayspu-x86.dll | $$(dir $$@)
         $(INSTALL) -m 644 $< $(@D)
 
@@ -251 +243 @@
                                            $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm.dll \
                                            $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm.dll \
-                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu.dll \
                                            $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil.dll \
                                            $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu.dll \
@@ -261 +252 @@
                                            $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm-x86.dll \
                                            $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm-x86.dll \
-                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu-x86.dll \
                                            $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil-x86.dll \
                                            $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu-x86.dll \

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

@@ -71 +71 @@
 ;gl VBoxD3D9wddm.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
 ;gl wined3dwddm.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
@@ -82 +81 @@
 ;amd64 ;gl VBoxD3D9wddm-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
 ;amd64 ;gl wined3dwddm-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
-;amd64 ;gl VBoxOGLarrayspu-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
 ;amd64 ;gl VBoxOGLcrutil-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
 ;amd64 ;gl VBoxOGLerrorspu-x86.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
@@ -142 +140 @@
 ;amd64 ;gl wined3dwddm-x86.dll = 1
 ;gl wined3dwddm.dll = 1
-;amd64 ;gl VBoxOGLarrayspu-x86.dll = 1
-;gl VBoxOGLarrayspu.dll = 1
 ;amd64 ;gl VBoxOGLcrutil-x86.dll = 1
 ;gl VBoxOGLcrutil.dll = 1

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

@@ -102 +102 @@
 ifdef VBOX_WITH_CROGL
 DRIVER_FILES += \
-        $(PATH_STAGE_BIN)/additions/VBoxOGLarrayspu.dll \
         $(PATH_STAGE_BIN)/additions/VBoxOGLcrutil.dll \
         $(PATH_STAGE_BIN)/additions/VBoxOGLerrorspu.dll \
@@ -116 +115 @@
         # running 32-bit OpenGL apps on that.
         DRIVER_FILES += \
-                $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLarrayspu.dll \
                 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLcrutil.dll \
                 $(VBOX_PATH_ADDITIONS.win.x86)/VBoxOGLerrorspu.dll \
@@ -165 +163 @@
         $(PATH_STAGE_BIN)/additions/VBoxD3D9wddm-x86.dll \
         $(PATH_STAGE_BIN)/additions/VBoxOGL-x86.dll \
-        $(PATH_STAGE_BIN)/additions/VBoxOGLarrayspu-x86.dll \
         $(PATH_STAGE_BIN)/additions/VBoxOGLcrutil-x86.dll \
         $(PATH_STAGE_BIN)/additions/VBoxOGLerrorspu-x86.dll \

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

@@ -64 +64 @@
 !if $%VBOX_WITH_CROGL% == "1"
   ; crOpenGL
-  FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"
   FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
   FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
@@ -84 +83 @@
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll"
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll"
-    FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLarrayspu.dll"
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLcrutil.dll"
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLerrorspu.dll"
@@ -115 +113 @@
 
   !if $%VBOX_WITH_CROGL% == "1"
-    FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"
     FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
     FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
@@ -137 +134 @@
 
     !if $%VBOX_WITH_CROGL% == "1"
-      FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu-x86.dll"
       FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll"
       FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll"

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

@@ -248 +248 @@
 
     !if $%VBOX_WITH_CROGL% == "1"
-      FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"
       FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
       FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
@@ -270 +269 @@
 
       !if $%VBOX_WITH_CROGL% == "1"
-        FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu-x86.dll"
         FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll"
         FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll"
@@ -294 +292 @@
   StrCpy $0 "$TEMP\VBoxGuestAdditions\VBoxOGL"
   CreateDirectory "$0"
-  !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"       "$g_strSystemDir\VBoxOGLarrayspu.dll"       "$0"
   !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"         "$g_strSystemDir\VBoxOGLcrutil.dll"         "$0"
   !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"       "$g_strSystemDir\VBoxOGLerrorspu.dll"       "$0"
@@ -312 +309 @@
     ; path after calling EnableX64FSRedirection
     ${EnableX64FSRedirection}
-    !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLarrayspu.dll"       "$SYSDIR\VBoxOGLarrayspu.dll"       "$0"
     !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLcrutil.dll"         "$SYSDIR\VBoxOGLcrutil.dll"         "$0"
     !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxOGLerrorspu.dll"       "$SYSDIR\VBoxOGLerrorspu.dll"       "$0"
@@ -544 +540 @@
   !endif
 
-    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"
     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
@@ -566 +561 @@
     !endif
 
-      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu-x86.dll"
       Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll"
       Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll"
@@ -654 +648 @@
   ${EndIf}
 
-  Delete /REBOOTOK "$g_strSystemDir\VBoxOGLarrayspu.dll"
   Delete /REBOOTOK "$g_strSystemDir\VBoxOGLcrutil.dll"
   Delete /REBOOTOK "$g_strSystemDir\VBoxOGLerrorspu.dll"
@@ -689 +682 @@
   !if $%BUILD_TARGET_ARCH% == "amd64"
     ; Only 64-bit installer: Also remove 32-bit DLLs on 64-bit target arch in Wow64 node
-    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLarrayspu.dll"
     Delete /REBOOTOK "$g_strSysWow64\VBoxOGLcrutil.dll"
     Delete /REBOOTOK "$g_strSysWow64\VBoxOGLerrorspu.dll"

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

@@ -1347 +1347 @@
     So just enumerate the 32-bit files in the SYSWOW directory. */
 #ifdef RT_ARCH_AMD64
-        { szSysWowDir,  "VBoxOGLarrayspu.dll" },
         { szSysWowDir,  "VBoxOGLcrutil.dll" },
         { szSysWowDir,  "VBoxOGLerrorspu.dll" },
@@ -1355 +1354 @@
         { szSysWowDir,  "VBoxOGL.dll" },
 #else  /* !RT_ARCH_AMD64 */
-        { szSysDir,     "VBoxOGLarrayspu.dll" },
         { szSysDir,     "VBoxOGLcrutil.dll" },
         { szSysDir,     "VBoxOGLerrorspu.dll" },

trunk/src/VBox/Additions/common/crOpenGL/.scm-settings

@@ -18 +18 @@
 # Much of this is externally licensed, but not all, sigh.
 --external-copyright --no-convert-tabs
-
-/array/arrayspu.rc:             --no-external-copyright --convert-tabs
 
 /feedback/feedbackspu.rc:       --no-external-copyright --convert-tabs

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

@@ -28 +28 @@
  DLLS += \
     VBoxOGL \
-    VBoxOGLarrayspu \
     VBoxOGLpassthroughspu \
     VBoxOGLpackspu \
@@ -36 +35 @@
 VBOX_OGL_X86_GUEST_DLLS = \
      VBoxOGL-x86 \
-     VBoxOGLarrayspu-x86 \
      VBoxOGLpassthroughspu-x86 \
      VBoxOGLpackspu-x86 \
@@ -445 +443 @@
   endif # VBOX_OGL_GLX_USE_CSTUBS
  endif
-endif
-
-#
-# VBoxOGLarrayspu
-#
-VBoxOGLarrayspu_TEMPLATE      = VBOXCROGLR3GUESTDLL
-VBoxOGLarrayspu_INCS          = \
-        array \
-        $(VBOX_GRAPHICS_INCS)
-if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGLarrayspu_INCS += \
-        $(VBOX_GL_INCS)
-endif
-if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
- VBoxOGLarrayspu_INSTTYPE.win = none
- VBoxOGLarrayspu_DEBUG_INSTTYPE.win = both
-endif
-VBoxOGLarrayspu_INCS.darwin  += $(PATH_OUT)/obj/VBoxOGL
-VBoxOGLarrayspu_INTERMEDIATES = \
-        $(VBOX_PATH_CROGL_GENFILES)/state/cr_currentpointers.h \
-        $(VBOX_PATH_CROGL_GENFILES)/state/cr_statefuncs.h
-VBoxOGLarrayspu_SOURCES       = \
-        array/arrayspu.c \
-        array/arrayspu_config.c \
-        array/arrayspu_init.c
-VBoxOGLarrayspu_SOURCES.win   = \
-        array/arrayspu.def \
-        array/arrayspu.rc
-VBoxOGLarrayspu_LIBS          = \
-        $(VBOX_LIB_OGL_CRUTIL) \
-        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB)
-ifdef VBOX_WITH_CRHGSMI
-VBoxOGLarrayspu_DEFS.win   += VBOX_WITH_CRHGSMI
-endif
-ifdef VBOX_WITH_WDDM
-VBoxOGLarrayspu_DEFS.win   += VBOX_WITH_WDDM
-endif
-
-ifdef VBOX_WITH_WDDM
-#
-# VBoxOGLarrayspu-x86 - x86 version of VBoxOGLarrayspu built for amd64 build
-#
-VBoxOGLarrayspu-x86_EXTENDS = VBoxOGLarrayspu
-VBoxOGLarrayspu-x86_BLD_TRG_ARCH = x86
-VBoxOGLarrayspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86) \
-        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB)
-VBoxOGLarrayspu-x86_DEFS = $(VBoxOGLarrayspu_DEFS) VBOX_WDDM_WOW64
 endif
 
@@ -670 +619 @@
  VBoxOGLfeedbackspu_DEBUG_INSTTYPE.win = both
 endif
-VBoxOGLarrayspu_INTERMEDIATES = \
+VBoxOGLfeedbackspu_INTERMEDIATES = \
         $(VBOX_PATH_CROGL_GENFILES)/feedbackspu_proto.h
 VBoxOGLfeedbackspu_SOURCES     = \

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

@@ -68 +68 @@
         vboxvideo_drv_16.so \
         vboxvideo_drv_17.so \
-        VBoxOGLarrayspu.so \
         VBoxOGLcrutil.so \
         VBoxOGLerrorspu.so \

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

@@ -125 +125 @@
 ifdef VBOX_WITH_CROGL
 VBOX_LNX_ADD_STRIP_LIB += \
-        VBoxOGLarrayspu.so \
         VBoxOGLcrutil.so \
         VBoxOGLerrorspu.so \

trunk/src/VBox/Additions/linux/installer/deffiles

@@ -32 +32 @@
     /usr/sbin/VBoxService \
     /sbin/mount.vboxsf \
-    /usr/lib/VBoxOGLarrayspu.so \
-    /usr/lib64/VBoxOGLarrayspu.so \
     /usr/lib/VBoxOGLcrutil.so \
     /usr/lib64/VBoxOGLcrutil.so \

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

@@ -174 +174 @@
         VBoxOGLfeedbackspu.so \
         VBoxOGLpassthroughspu.so \
-        VBoxOGLarrayspu.so \
         VBoxOGLerrorspu.so \
         VBoxOGLpackspu.so