From 735a9e9faccd977a072fb71f69aabd36282cb623 Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Wed, 11 Mar 2026 12:33:30 -0700
Subject: [PATCH] ci/test-vk: Install win64 apitrace 14.0 along with setting up
 wine.

This will let us replay d3d traces in replay testing.  This replaces a
dead apitrace script that used to be used in CI.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40959>
---
 .gitlab-ci/container/build-wine.sh            | 21 +++++++++++++++++++
 .gitlab-ci/container/fdo_cntr_export.sh       |  1 +
 .gitlab-ci/container/install-wine-apitrace.sh | 16 --------------
 3 files changed, 22 insertions(+), 16 deletions(-)
 delete mode 100644 .gitlab-ci/container/install-wine-apitrace.sh

diff --git a/.gitlab-ci/container/build-wine.sh b/.gitlab-ci/container/build-wine.sh
index 7f559a7b026..0323b1e9178 100644
--- a/.gitlab-ci/container/build-wine.sh
+++ b/.gitlab-ci/container/build-wine.sh
@@ -43,6 +43,26 @@ while ! test -f  "${WINEPREFIX}/system.reg"; do sleep 1; done
 
 section_end wine
 
+section_start wine-apitrace "Setting up Apitrace for Wine"
+
+APITRACE_VERSION="14.0"
+APITRACE_VERSION_DATE=""
+
+APITRACE_ARCH=""
+if [ "$DEBIAN_ARCH" == "arm64" ]; then
+  APITRACE_ARCH="-arm"
+fi
+
+curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
+  "https://github.com/apitrace/apitrace/releases/download/${APITRACE_VERSION}/apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64${APITRACE_ARCH}.7z"
+7zr x "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64${APITRACE_ARCH}.7z" \
+      "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64${APITRACE_ARCH}/bin/apitrace.exe" \
+      "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64${APITRACE_ARCH}/bin/d3dretrace.exe"
+mv "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64${APITRACE_ARCH}" /apitrace-msvc-win64
+rm "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64${APITRACE_ARCH}.7z"
+
+section_end wine-apitrace
+
 
 # Archive and upload wine for use as a LAVA overlay, if the archive doesn't exist yet
 WINE_S3_ARTIFACT="wine.tar.zst"
@@ -53,6 +73,7 @@ else
   echo "Uploaded wine not found, reuploading..."
   tar --zstd -cf "$WINE_S3_ARTIFACT" -C / \
     "${WINEPREFIX#/}" \
+    /apitrace-msvc-win64 \
     /usr/lib/*/wine
   ci-fairy s3cp --token-file "${S3_JWT_FILE}" "$WINE_S3_ARTIFACT" \
     "https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${ARTIFACT_PATH}"
diff --git a/.gitlab-ci/container/fdo_cntr_export.sh b/.gitlab-ci/container/fdo_cntr_export.sh
index d6c5469626c..0db2fe3464c 100644
--- a/.gitlab-ci/container/fdo_cntr_export.sh
+++ b/.gitlab-ci/container/fdo_cntr_export.sh
@@ -48,6 +48,7 @@ buildah_export() {
     # These components will be provided via LAVA overlays,
     # so remove them from the core rootfs
     rm -rf "${mountpoint}/android-cts"
+    rm -rf "${mountpoint}/apitrace-msvc-win64"
     rm -rf "${mountpoint}/cuttlefish"
     rm -rf "${mountpoint}/fluster/resources"
     rm -rf "${mountpoint}/usr/lib/*/wine"
diff --git a/.gitlab-ci/container/install-wine-apitrace.sh b/.gitlab-ci/container/install-wine-apitrace.sh
deleted file mode 100644
index eb4f168edea..00000000000
--- a/.gitlab-ci/container/install-wine-apitrace.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -ue
-
-APITRACE_VERSION="11.1"
-APITRACE_VERSION_DATE=""
-
-curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
-  "https://github.com/apitrace/apitrace/releases/download/${APITRACE_VERSION}/apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64.7z"
-7zr x "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64.7z" \
-      "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64/bin/apitrace.exe" \
-      "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64/bin/d3dretrace.exe"
-mv "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64" /apitrace-msvc-win64
-rm "apitrace-${APITRACE_VERSION}${APITRACE_VERSION_DATE}-win64.7z"
-
-