ci: Remove non-Proton Wine

We previously only had two traces (one for Raven, one for lavapipe)
running via Wine. To support this, the Vulkan container had Debian's
full Wine installation, one from DXVK, and then a third from Proton
which is used by the b2c jobs.

At 600MB each, this was pretty unsustainable. Remove everything but the
Proton ones.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31595>

.gitlab-ci/container/debian/test-vk.sh

@@ -71,22 +71,6 @@ apt-get update
 apt-get install -y --no-remove --no-install-recommends \
       "${DEPS[@]}" "${EPHEMERAL[@]}"
 
-############### Install DXVK
-
-. .gitlab-ci/container/setup-wine.sh "/dxvk-wine64"
-. .gitlab-ci/container/install-wine-dxvk.sh
-
-############### Install apitrace binaries for wine
-
-. .gitlab-ci/container/install-wine-apitrace.sh
-# Add the apitrace path to the registry
-wine \
-    reg add "HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment" \
-    /v Path \
-    /t REG_EXPAND_SZ \
-    /d "C:\windows\system32;C:\windows;C:\windows\system32\wbem;Z:\apitrace-msvc-win64\bin" \
-    /f
-
 ############### Building ...
 
 . .gitlab-ci/container/container_pre_build.sh

.gitlab-ci/container/lava_build.sh

@@ -249,21 +249,6 @@ mmdebstrap \
 ############### Install mold
 . .gitlab-ci/container/build-mold.sh
 
-############### Setuping
-if [ "$DEBIAN_ARCH" = "amd64" ]; then
-  . .gitlab-ci/container/setup-wine.sh "/dxvk-wine64"
-  . .gitlab-ci/container/install-wine-dxvk.sh
-  mv /dxvk-wine64 $ROOTFS
-fi
-
-############### Installing
-if [ "$DEBIAN_ARCH" = "amd64" ]; then
-  . .gitlab-ci/container/install-wine-apitrace.sh
-  mkdir -p "$ROOTFS/apitrace-msvc-win64"
-  mv /apitrace-msvc-win64/bin "$ROOTFS/apitrace-msvc-win64"
-  rm -rf /apitrace-msvc-win64
-fi
-
 ############### Building
 STRIP_CMD="${GCC_ARCH}-strip"
 mkdir -p $ROOTFS/usr/lib/$GCC_ARCH

.gitlab-ci/container/strip-rootfs.sh

@@ -114,6 +114,7 @@ directories=(
   /usr/lib/*/libdb-5.3.so # libdb-5.3.so that is only used by this pam module ^
   /usr/lib/*/libnss_hesiod* # remove NSS support for nis, nisplus and hesiod
   /usr/lib/*/libnss_nis*
+  /usr/lib/*/wine # don't need Wine's implementation, using Proton instead
 )
 
 for directory in "${directories[@]}"; do

.gitlab-ci/image-tags.yml

@@ -29,8 +29,8 @@ variables:
 
    DEBIAN_TEST_ANDROID_TAG: "20241011-deqpr"
    DEBIAN_TEST_GL_TAG: "20241015-piglit-7c"
-   DEBIAN_TEST_VK_TAG: "20241015-piglit-7c"
-   KERNEL_ROOTFS_TAG: "20241011-deqpr"
+   DEBIAN_TEST_VK_TAG: "20241016-teetotal"
+   KERNEL_ROOTFS_TAG: "20241016-teetotal"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20241002-pyutils"

.gitlab-ci/piglit/piglit-traces.sh

@@ -24,33 +24,12 @@ else
     export PIGLIT_REPLAY_EXTRA_ARGS="--keep-image ${PIGLIT_REPLAY_EXTRA_ARGS}"
 fi
 
-# WINE
-case "$PIGLIT_REPLAY_DEVICE_NAME" in
-  vk-*)
-    export WINEPREFIX="/dxvk-wine64"
-    ;;
-  *)
-    export WINEPREFIX="/generic-wine64"
-    ;;
-esac
-
-#PATH="/opt/wine-stable/bin/:$PATH" # WineHQ path
-
-# Avoid asking about Gecko or Mono instalation
-export WINEDLLOVERRIDES="mscoree=d;mshtml=d"  # FIXME: drop, not needed anymore? (wine dir is already created)
-
-
 # Set up the environment.
 # Modifiying here directly LD_LIBRARY_PATH may cause problems when
 # using a command wrapper. Hence, we will just set it when running the
 # command.
 export __LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/"
 if [ -n "${VK_DRIVER}" ]; then
-  # Set environment for DXVK.
-  export DXVK_LOG_LEVEL="info"
-  export DXVK_LOG="$RESULTS_DIR/dxvk"
-  [ -d "$DXVK_LOG" ] || mkdir -pv "$DXVK_LOG"
-  export DXVK_STATE_CACHE=0
   ARCH=$(uname -m)
   export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
 fi
@@ -68,9 +47,6 @@ quiet() {
 
 # Set environment for apitrace executable.
 export PATH="/apitrace/build:$PATH"
-export PIGLIT_REPLAY_WINE_BINARY=wine
-export PIGLIT_REPLAY_WINE_APITRACE_BINARY="/apitrace-msvc-win64/bin/apitrace.exe"
-export PIGLIT_REPLAY_WINE_D3DRETRACE_BINARY="/apitrace-msvc-win64/bin/d3dretrace.exe"
 
 echo "Version:"
 apitrace version 2>/dev/null || echo "apitrace not found (Linux)"