VERSION: bump for 26.0.5

I don't entirely understand what this is all doing, but this looks like a
copy-paste error.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Backport-to: 26.0
(cherry picked from commit a6b86d43d3)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40979>

.clang-format-ignore

@@ -1,4 +1,2 @@
 # Vendored code
 src/amd/vulkan/radix_sort/*
-src/gallium/drivers/ethosu/mlw_codec/**/*
-src/gallium/drivers/ethosu/ethosu_encode_support.h

.clang-format-include

@@ -12,4 +12,3 @@ src/amd/compiler/**/*
 src/egl/**/*
 src/etnaviv/isa/**/*
 src/imagination/**/*
-src/kosmickrisp/**/*

.gitlab-ci.yml

@@ -234,7 +234,7 @@ include:
   rules:
     - !reference [.common-rules, rules]
     # Run when re-enabling a disabled farm, but not when disabling it
-    - !reference [.disable-farm-rules, rules]
+    - !reference [.disable-farm-mr-rules, rules]
     # Never run immediately after merging, as we just ran everything
     - !reference [.never-post-merge-rules, rules]
     # Only rebuild containers in merge pipelines if any tags have been
@@ -285,7 +285,7 @@ include:
   rules:
     - !reference [.common-rules, rules]
     # Run when re-enabling a disabled farm, but not when disabling it
-    - !reference [.disable-farm-rules, rules]
+    - !reference [.disable-farm-mr-rules, rules]
     # Never run immediately after merging, as we just ran everything
     - !reference [.never-post-merge-rules, rules]
     # Build everything in merge pipelines, if any files affecting the pipeline
@@ -344,7 +344,7 @@ include:
   rules:
     - !reference [.common-rules, rules]
     # Run when re-enabling a disabled farm, but not when disabling it
-    - !reference [.disable-farm-rules, rules]
+    - !reference [.disable-farm-mr-rules, rules]
     # Never run immediately after merging, as we just ran everything
     - !reference [.never-post-merge-rules, rules]
     # Build everything in merge pipelines, if any files affecting the pipeline

.gitlab-ci/all-flakes.txt

@@ -1,5 +0,0 @@
-# wsi_common_display.c doesn't properly hand off the oldSwapchain to the new one,
-# and you can end up trying to atomic commit before the last present has flipped,
-# and the kernel throws an error.
-dEQP-VK.wsi.direct.present_timing.basic.retired_swapchain
-dEQP-VK.wsi.direct_drm.present_timing.basic.retired_swapchain

.gitlab-ci/all-single-thread.txt

@@ -1,39 +0,0 @@
-# These tests require DRM master priveleges (sole access to the device),
-# otherwise they return Skip.
-dEQP-VK.wsi.direct.*
-dEQP-VK.wsi.acquire_drm.*
-
-# These tests try to allocate up to half of the device memory, which doesn't go
-# well when other tests are running in parallel.
-dEQP-VK.memory.mapping.*.full.variable.implicit_unmap
-dEQP-VK.memory.mapping.*.full.variable.implicit_unmap_map2
-
-# These allocate 600+MB of just the string for the spirv assembly in addition to
-# normal deqp-vk memory overhead, which loves to thrash swap with other tests.
-dEQP-VK.spirv_assembly.instruction.*.spirv_ids_abuse.lots_ids.*
-
-# 2GB GPU memory for zink-tu
-spec@!opengl 1.2@tex3d-maxsize
-# 1GB GPU memory for a 16kx16k-sized driver.
-spec@ext_framebuffer_object@fbo-maxsize
-# 6GB GPU memory for zink-tu
-spec@!opengl 1.1@max-texture-size
-
-# 2GB GPU memory on tu
-vkd3d-test_committed_non_zeroed_behavior_stress
-# 600MB GPU memory on tu
-vkd3d-test_fence_ping_pong_deadlock_stress_plain
-# 2GB GPU memory on tu
-vkd3d-test_heap_non_zeroed_behavior_stress
-# 500MB GPU memory on tu
-vkd3d-test_fence_wait_robustness
-# Allocates a 2GB texel buffer
-vkd3d-test_large_texel_buffer_view
-# 550MB GPU memory on tu
-vkd3d-test_placed_image_alignment
-# Allocates until heap OOM.
-vkd3d-test_stress_fallback_render_target_allocation_device
-# 3GB GPU memory on tu
-vkd3d-test_stress_suballocation_multithread
-# 2GB GPU memory on tu
-vkd3d-test_stress_suballocation_rebar

.gitlab-ci/all-skips.txt

@@ -26,6 +26,20 @@ glx@glx_arb_sync_control@timing.*
 # This test is not built with waffle, while we do build tests with waffle
 spec@!opengl 1.1@windowoverlap
 
+# These tests all read from the front buffer after a swap.  Given that we
+# run piglit tests in parallel in Mesa CI, and don't have a compositor
+# running, the frontbuffer reads may end up with undefined results from
+# windows overlapping us.
+#
+# Piglit does mark these tests as not to be run in parallel, but deqp-runner
+# doesn't respect that.  We need to extend deqp-runner to allow some tests to be
+# marked as single-threaded and run after the rayon loop if we want to support
+# them.
+#
+# Note that "glx-" tests don't appear in x11-skips.txt because they can be
+# run even if PIGLIT_PLATFORM=gbm (for example)
+glx@glx-copy-sub-buffer.*
+
 # These test the loader more than the implementation and are broken because the
 # Vulkan loader in Debian is too old
 dEQP-VK.api.get_device_proc_addr.non_enabled
@@ -35,12 +49,27 @@ dEQP-VK.api.version_check.unavailable_entry_points
 spec@arb_program_interface_query@arb_program_interface_query-getprogramresourceindex
 spec@arb_program_interface_query@arb_program_interface_query-getprogramresourceindex@'vs_input2[1][0]' on GL_PROGRAM_INPUT
 
-# gbm does not support reading the front buffer after a swapbuffers, and
+# These tests attempt to read from the front buffer after a swap. They are skipped
+# on both X11 and gbm, but for different reasons:
+#
+# On X11: Given that we run piglit tests in parallel in Mesa CI, and don't have a
+# compositor running, the frontbuffer reads may end up with undefined results from
+# windows overlapping us.
+# Piglit does mark these tests as not to be run in parallel, but deqp-runner
+# doesn't respect that.  We need to extend deqp-runner to allow some tests to be
+# marked as single-threaded and run after the rayon loop if we want to support
+# them.
+# Other front-buffer access tests like fbo-sys-blit, fbo-sys-sub-blit, or
+# fcc-front-buffer-distraction don't appear here, because the DRI3 fake-front
+# handling should be holding the pixels drawn by the test even if we happen to fail
+# GL's window system pixel occlusion test.
+# Note that glx skips don't appear here, they're in all-skips.txt (in case someone
+# sets PIGLIT_PLATFORM=gbm to mostly use gbm, but still has an X server running).
+#
+# On gbm: gbm does not support reading the front buffer after a swapbuffers, and
 # that's intentional. Don't bother running these tests when PIGLIT_PLATFORM=gbm.
 # Note that this doesn't include tests like fbo-sys-blit, which draw/read front
 # but don't swap.
-#
-# piglit should probably be fixed to throw skip on this platform
 spec@!opengl 1.0@gl-1.0-swapbuffers-behavior
 spec@!opengl 1.1@read-front
 

.gitlab-ci/all-slow-skips.txt

@@ -1,6 +0,0 @@
-# These are variants of
-# dEQP-VK.memory.mapping.suballocation.full.variable.implicit_unmap* that
-# are very slow (often 30s on DUTs) due to allocating, mapping, filling,
-# and reading back 32GB of memory, while not providing interesting pre-merge
-# coverage for us.
-dEQP-VK.memory.mapping.dedicated_alloc.*.implicit_unmap.*

.gitlab-ci/android-runner.sh

@@ -8,18 +8,8 @@ set -uex
 
 : "${ADB:=adb}"
 
-$ADB wait-for-device
-for i in $(seq 1 5); do
-    if $ADB root; then
-        break
-    fi
-    if [ "$i" -eq 5 ]; then
-        echo "Failed to get adb root after 5 attempts"
-        exit 1
-    fi
-    sleep 2
-done
-$ADB wait-for-device
+$ADB wait-for-device root
+sleep 1
 
 # overlay 
 
@@ -81,10 +71,17 @@ $ADB push "$INSTALL/lib/libEGL.so" /vendor/lib64/egl/libEGL_mesa.so
 $ADB push "$INSTALL/lib/libGLESv1_CM.so" /vendor/lib64/egl/libGLESv1_CM_mesa.so
 $ADB push "$INSTALL/lib/libGLESv2.so" /vendor/lib64/egl/libGLESv2_mesa.so
 
-# Remove and replace Vulkan drivers
-if [ "${CUTTLEFISH_GPU_MODE:-}" = "venus" ] || [ "${CUTTLEFISH_GPU_MODE:-}" = "venus_guest_angle" ]; then
-  $ADB shell rm -f /vendor/lib64/hw/vulkan.virtio.so*
-  $ADB push "$INSTALL/lib/libvulkan_virtio.so" /vendor/lib64/hw/vulkan.virtio.so
+# Remove and replace Vulkan drivers:
+# - For Cuttlefish virtual machines, replace lavapipe or venus
+# - For Android hardware, replace the Vulkan driver specified by VK_DRIVER
+if [ -n "${CUTTLEFISH_GPU_MODE:-}" ]; then
+  if [ "$CUTTLEFISH_GPU_MODE" = "mesa_swrast" ] || [ "$CUTTLEFISH_GPU_MODE" = "mesa_swrast_guest_angle" ]; then
+    $ADB shell rm -f /vendor/lib64/hw/vulkan.lvp.so*
+    $ADB push "$INSTALL/lib/libvulkan_lvp.so" /vendor/lib64/hw/vulkan.lvp.so
+  else
+    $ADB shell rm -f /vendor/lib64/hw/vulkan.virtio.so*
+    $ADB push "$INSTALL/lib/libvulkan_virtio.so" /vendor/lib64/hw/vulkan.virtio.so
+  fi
 else
   $ADB shell rm -f /vendor/lib64/hw/vulkan.${VK_DRIVER}.so*
   $ADB push "$INSTALL/lib/libvulkan_${VK_DRIVER}.so" /vendor/lib64/hw/vulkan.${VK_DRIVER}.so
@@ -132,6 +129,7 @@ if ! printf "%s" "$VK_RUNTIME_VERSION" | grep -Fq -- "${MESA_BUILD_VERSION}"; th
 fi
 
 get_surfaceflinger_pid() {
+  while [ "$($ADB shell dumpsys -l | grep 'SurfaceFlinger$')" = "" ] ; do sleep 1; done
   $ADB shell ps -A | grep -i surfaceflinger | tr -s ' ' | cut -d ' ' -f 2
 }
 

.gitlab-ci/android-skips.txt

@@ -1,4 +1,8 @@
-# Skip these tests when running fractional dEQP batches, as the AHB and WSI tests are
-# expected to be handled separately in non-fractional runs within the deqp-runner suite.
+# Skip these tests when running fractional dEQP batches, as the AHB tests are expected
+# to be handled separately  in a non-fractional run within the deqp-runner suite.
 dEQP-VK.api.external.memory.android_hardware_buffer.*
+
+# Skip all WSI tests: the DEQP_ANDROID_EXE build used can't create native windows, as
+# only APKs support window creation on Android.
+dEQP-VK.image.swapchain_mutable.*
 dEQP-VK.wsi.*

.gitlab-ci/bare-metal/poe-powered.sh

@@ -75,6 +75,8 @@ section_start prepare_rootfs "Preparing rootfs components"
 
 set -ex
 
+date +'%F %T'
+
 # Clear out any previous run's artifacts.
 rm -rf results/
 mkdir -p results
@@ -83,6 +85,8 @@ mkdir -p results
 # state, since it's volume-mounted on the host.
 rsync -a --delete $BM_ROOTFS/ /nfs/
 
+date +'%F %T'
+
 # If BM_BOOTFS is an URL, download it
 if echo $BM_BOOTFS | grep -q http; then
   curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
@@ -90,6 +94,8 @@ if echo $BM_BOOTFS | grep -q http; then
   BM_BOOTFS=/tmp/bootfs.tar
 fi
 
+date +'%F %T'
+
 # If BM_BOOTFS is a file, assume it is a tarball and uncompress it
 if [ -f "${BM_BOOTFS}" ]; then
   mkdir -p /tmp/bootfs
@@ -97,6 +103,8 @@ if [ -f "${BM_BOOTFS}" ]; then
   BM_BOOTFS=/tmp/bootfs
 fi
 
+date +'%F %T'
+
 # Install kernel modules (it could be either in /lib/modules or
 # /usr/lib/modules, but we want to install in the latter)
 if [ -n "${BM_BOOTFS}" ]; then
@@ -107,6 +115,8 @@ else
 fi
 
 
+date +'%F %T'
+
 # Install kernel image + bootloader files
 if [ -z "$BM_BOOTFS" ]; then
   mv "${BM_KERNEL}" "${BM_DTB}.dtb" /tftp/
@@ -114,9 +124,13 @@ else  # BM_BOOTFS
   rsync -aL --delete $BM_BOOTFS/boot/ /tftp/
 fi
 
+date +'%F %T'
+
 # Create the rootfs in the NFS directory
 . $BM/rootfs-setup.sh /nfs
 
+date +'%F %T'
+
 echo "$BM_CMDLINE" > /tftp/cmdline.txt
 
 # Add some options in config.txt, if defined
@@ -166,10 +180,13 @@ python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close-dut-job
 python3 $CI_INSTALL/custom_logger.py ${STRUCTURED_LOG_FILE} --close
 set -e
 
+date +'%F %T'
+
 # Bring artifacts back from the NFS dir to the build dir where gitlab-runner
 # will look for them.
 cp -Rp /nfs/results/. results/
 
+date +'%F %T'
 section_end dut_cleanup
 
 exit $ret

.gitlab-ci/bare-metal/poe_run.py

@@ -25,16 +25,17 @@ import argparse
 import os
 import re
 import sys
+import threading
 
 from custom_logger import CustomLogger
 from serial_buffer import SerialBuffer
 
-
 class PoERun:
     def __init__(self, args, boot_timeout, test_timeout, logger):
         self.powerup = args.powerup
         self.powerdown = args.powerdown
-        self.ser = SerialBuffer(args.dev, "results/serial-output.txt")
+        self.ser = SerialBuffer(
+            args.dev, "results/serial-output.txt", ": ")
         self.boot_timeout = boot_timeout
         self.test_timeout = test_timeout
         self.logger = logger

.gitlab-ci/bare-metal/rootfs-setup.sh

@@ -9,10 +9,14 @@ mkdir -p $rootfs_dst/results
 cp $BM/bm-init.sh $rootfs_dst/init
 cp $CI_COMMON/init*.sh $rootfs_dst/
 
+date +'%F %T'
+
 # Make JWT token available as file in the bare-metal storage to enable access
 # to MinIO
 cp "${S3_JWT_FILE}" "${rootfs_dst}${S3_JWT_FILE}"
 
+date +'%F %T'
+
 cp "$SCRIPTS_DIR/setup-test-env.sh" "$rootfs_dst/"
 
 set +x
@@ -26,3 +30,5 @@ set -x
 # Add the Mesa drivers we built, and make a consistent symlink to them.
 mkdir -p $rootfs_dst/$CI_PROJECT_DIR
 rsync -aH --delete $CI_PROJECT_DIR/install/ $rootfs_dst/$CI_PROJECT_DIR/install/
+
+date +'%F %T'

.gitlab-ci/bare-metal/serial_buffer.py

@@ -22,6 +22,7 @@
 # IN THE SOFTWARE.
 
 import argparse
+from datetime import datetime, UTC
 import queue
 import serial
 import threading
@@ -29,7 +30,7 @@ import time
 
 
 class SerialBuffer:
-    def __init__(self, dev, filename, timeout=None, line_queue=None):
+    def __init__(self, dev, filename, prefix, timeout=None, line_queue=None):
         self.filename = filename
         self.dev = dev
 
@@ -48,6 +49,7 @@ class SerialBuffer:
             self.line_queue = line_queue
         else:
             self.line_queue = queue.Queue()
+        self.prefix = prefix
         self.timeout = timeout
         self.sentinel = object()
         self.closing = False
@@ -86,7 +88,7 @@ class SerialBuffer:
                     break
                 self.byte_queue.put(b)
             except Exception as err:
-                print(str(err))
+                print(self.prefix + str(err))
                 break
         self.byte_queue.put(self.sentinel)
 
@@ -128,7 +130,10 @@ class SerialBuffer:
                 if b == b'\n'[0]:
                     line = line.decode(errors="replace")
 
-                    print("{endc}{line}".format(line=line, endc='\033[0m'), flush=True, end='')
+                    ts = datetime.now(tz=UTC)
+                    ts_str = f"{ts.hour:02}:{ts.minute:02}:{ts.second:02}.{int(ts.microsecond / 1000):03}"
+                    print("{endc}{time}{prefix}{line}".format(
+                        time=ts_str, prefix=self.prefix, line=line, endc='\033[0m'), flush=True, end='')
 
                     self.line_queue.put(line)
                     line = bytearray()
@@ -165,10 +170,12 @@ def main():
     parser.add_argument('--dev', type=str, help='Serial device')
     parser.add_argument('--file', type=str,
                         help='Filename for serial output', required=True)
+    parser.add_argument('--prefix', type=str,
+                        help='Prefix for logging serial to stdout', nargs='?')
 
     args = parser.parse_args()
 
-    ser = SerialBuffer(args.dev, args.file)
+    ser = SerialBuffer(args.dev, args.file, args.prefix or "")
     for line in ser.lines():
         # We're just using this as a logger, so eat the produced lines and drop
         # them

.gitlab-ci/build/gitlab-ci.yml

@@ -45,7 +45,6 @@ debian-x86_64:
       -D tools=drm-shim
       -D valgrind=disabled
       -D perfetto=true
-      -D vulkan-layers=screenshot
     S3_ARTIFACT_NAME: mesa-x86_64-default-${BUILDTYPE}
     RUN_MESON_TESTS: "false"  # debian-build-x86_64 already runs these
   artifacts:
@@ -60,6 +59,9 @@ debian-x86_64-asan:
   variables:
     VULKAN_DRIVERS: "swrast,amd,intel"
     GALLIUM_DRIVERS: "llvmpipe,softpipe,zink,r300"
+    C_ARGS: >
+      -Wno-error=stringop-truncation
+      -Wno-error=deprecated-declarations
     EXTRA_OPTION: >
       -D intel-elk=false
       -D intel-rt=false
@@ -120,6 +122,7 @@ debian-x86_64-msan:
       -Wno-error=overloaded-virtual
       -Wno-error=tautological-constant-out-of-range-compare
       -Wno-error=unused-private-field
+      -Wno-error=vla-cxx-extension
       -Wno-error=deprecated-declarations
     RUN_MESON_TESTS: "false"  # just too slow
     # Do a host build for mesa-clc and precomp-compiler (msan complains about uninitialized
@@ -137,7 +140,6 @@ debian-x86_64-msan:
       -D precomp-compiler=enabled
       -D install-precomp-compiler=true
       -D tools=panfrost
-      -D panfrost-rust=true
 
 debian-x86_64-ubsan:
   extends:
@@ -145,6 +147,12 @@ debian-x86_64-ubsan:
     - .meson-build-for-tests
     - .build-run-long
   variables:
+    C_ARGS: >
+      -Wno-error=stringop-overflow
+      -Wno-error=stringop-truncation
+      -Wno-error=deprecated-declarations
+    CPP_ARGS: >
+      -Wno-error=array-bounds
     GALLIUM_DRIVERS: "llvmpipe,softpipe"
     VULKAN_DRIVERS: "swrast"
     EXTRA_OPTION: >
@@ -186,7 +194,7 @@ debian-build-x86_64:
     GALLIUM_ST: >
       -D gallium-extra-hud=true
       -D gallium-va=enabled
-      -D gallium-rusticl=true
+      -D gallium-rusticl=false
       -D legacy-wayland=bind-wayland-display
     GALLIUM_DRIVERS: "i915,iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus,radeonsi"
     VULKAN_DRIVERS: "intel_hasvk,imagination,microsoft-experimental,nouveau,swrast"
@@ -194,7 +202,6 @@ debian-build-x86_64:
     EXTRA_OPTION: >
       -D spirv-to-dxil=true
       -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi
-      -D panfrost-rust=true
       -D perfetto=true
     S3_ARTIFACT_NAME: debian-build-x86_64
 
@@ -206,6 +213,7 @@ debian-release:
   variables:
     UNWIND: "enabled"
     C_ARGS: >
+      -Wno-error=stringop-overread
       -Wno-error=deprecated-declarations
     CPP_ARGS: >
       -Wno-error=deprecated-declarations
@@ -226,7 +234,6 @@ debian-release:
       -D spirv-to-dxil=true
       -D tools=all
       -D mesa-clc=enabled
-      -D panfrost-rust=true
       -D precomp-compiler=enabled
       -D intel-rt=enabled
       -D imagination-srv=true
@@ -245,6 +252,8 @@ alpine-build-testing:
     C_ARGS: >
       -Wno-error=cpp
       -Wno-error=array-bounds
+      -Wno-error=stringop-overflow
+      -Wno-error=stringop-overread
       -Wno-error=deprecated-declarations
     DRI_LOADERS: >
       -D glx=disabled
@@ -280,10 +289,14 @@ fedora-release:
     # maybe-uninitialized is misfiring in nir_lower_gs_intrinsics.c, and
     # a "maybe" warning should never be an error anyway.
     C_ARGS: >
+      -Wno-error=stringop-overflow
+      -Wno-error=stringop-overread
       -Wno-error=array-bounds
       -Wno-error=maybe-uninitialized
       -Wno-error=deprecated-declarations
     CPP_ARGS: >
+      -Wno-error=dangling-reference
+      -Wno-error=overloaded-virtual
       -Wno-error=deprecated-declarations
     DRI_LOADERS: >
       -D glx=dri
@@ -326,8 +339,13 @@ debian-android:
       -Wno-error=enum-conversion
       -Wno-error=initializer-overrides
       -Wno-error=sometimes-uninitialized
+      -Wno-error=deprecated-declarations
     CPP_ARGS: >
       -Wno-error=c99-designator
+      -Wno-error=unused-variable
+      -Wno-error=unused-but-set-variable
+      -Wno-error=self-assign
+      -Wno-error=deprecated-declarations
     DRI_LOADERS: >
       -D glx=disabled
       -D gbm=disabled
@@ -345,7 +363,6 @@ debian-android:
       -D mesa-clc=system
       -D precomp-compiler=system
       -D perfetto=true
-      -D freedreno-kmds=msm,virtio
     GALLIUM_ST: >
       -D gallium-va=disabled
       -D gallium-rusticl=false
@@ -465,6 +482,10 @@ debian-arm64:
     - .ci-deqp-artifacts
     - .meson-build-for-tests
   variables:
+    C_ARGS: >
+      -Wno-error=array-bounds
+      -Wno-error=stringop-truncation
+      -Wno-error=deprecated-declarations
     GALLIUM_DRIVERS: "etnaviv,freedreno,lima,panfrost,v3d,vc4,zink"
     VULKAN_DRIVERS: "broadcom,freedreno,imagination,panfrost"
     DRI_LOADERS:
@@ -475,11 +496,8 @@ debian-arm64:
       -D freedreno-kmds=msm,virtio
       -D teflon=true
       -D perfetto=true
-      -D vulkan-layers=screenshot
-      -D panfrost-rust=true
     GALLIUM_ST:
       -D gallium-rusticl=true
-      -D legacy-wayland=bind-wayland-display
     RUN_MESON_TESTS: "false"  # run by debian-arm64-build-testing
     S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE}
 
@@ -491,6 +509,8 @@ debian-arm64-asan:
   variables:
     VULKAN_DRIVERS: "broadcom,freedreno,panfrost"
     GALLIUM_DRIVERS: "freedreno,vc4,v3d,panfrost"
+    C_ARGS: >
+      -Wno-error=deprecated-declarations
     DRI_LOADERS:
       -D glvnd=disabled
     EXTRA_OPTION: >
@@ -498,7 +518,6 @@ debian-arm64-asan:
       -D valgrind=disabled
       -D tools=dlclose-skip
       -D gallium-rusticl=false
-      -D panfrost-rust=true
     ARTIFACTS_DEBUG_SYMBOLS: 1
     RUN_MESON_TESTS: "false"  # just too slow
     S3_ARTIFACT_NAME: mesa-arm64-asan-${BUILDTYPE}
@@ -513,6 +532,12 @@ debian-arm64-ubsan:
     GALLIUM_DRIVERS: "v3d,vc4"
     C_ARGS: >
       -Wno-error=array-bounds
+      -Wno-error=stringop-overflow
+      -Wno-error=stringop-truncation
+      -Wno-error=deprecated-declarations
+    CPP_ARGS: >
+      -Wno-error=array-bounds
+      -fno-var-tracking-assignments
     DRI_LOADERS:
       -D glvnd=disabled
     EXTRA_OPTION: >
@@ -533,7 +558,6 @@ debian-arm64-build-test:
       -D glvnd=disabled
     EXTRA_OPTION: >
       -D tools=panfrost,imagination
-      -D panfrost-rust=true
       -D perfetto=true
 
 debian-arm64-release:
@@ -543,6 +567,10 @@ debian-arm64-release:
   variables:
     BUILDTYPE: release
     S3_ARTIFACT_NAME: mesa-arm64-default-${BUILDTYPE}
+    C_ARGS: >
+      -Wno-error=array-bounds
+      -Wno-error=stringop-overread
+      -Wno-error=deprecated-declarations
   script:
     - !reference [.meson-build-only, script]
     - 'if [ -n "$MESA_CI_PERFORMANCE_ENABLED" ]; then .gitlab-ci/prepare-artifacts.sh; fi'
@@ -555,13 +583,15 @@ debian-no-libdrm:
     VULKAN_DRIVERS: freedreno
     GALLIUM_DRIVERS: "zink,llvmpipe"
     BUILDTYPE: release
+    C_ARGS: >
+      -Wno-error=stringop-overread
+      -Wno-error=deprecated-declarations
     EXTRA_OPTION: >
       -D freedreno-kmds=kgsl
-      -D glx=dri
+      -D glx=disabled
       -D gbm=disabled
-      -D egl=enabled
+      -D egl=disabled
       -D perfetto=true
-      -D platforms=x11,wayland
 
 debian-clang:
   extends:
@@ -604,7 +634,6 @@ debian-clang:
       -D spirv-to-dxil=true
       -D imagination-srv=true
       -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi,imagination
-      -D panfrost-rust=true
       -D vulkan-layers=device-select,overlay
       -D build-radv-tests=true
       -D build-aco-tests=true
@@ -692,7 +721,6 @@ debian-vulkan:
       -D build-aco-tests=true
       -D intel-rt=disabled
       -D imagination-srv=true
-      -D panfrost-rust=true
 
 debian-x86_32:
   extends:
@@ -726,10 +754,9 @@ debian-x86_32:
       -D platforms=
       -D mesa-clc=enabled
       -D install-mesa-clc=true
-      -D panfrost-rust=true
 
 # In case of issues with this job, contact @frankbinns
-.debian-riscv64:
+debian-riscv64:
   extends:
     - .meson-cross
     - .use-debian/riscv64_build

.gitlab-ci/ci-tron/gitlab-ci.yml

@@ -96,21 +96,6 @@
     - job: debian-x86_64
       artifacts: false
 
-.ci-tron-x86_64-test-vk-asan:
-  extends:
-    - .use-debian/x86_64_test-vk
-    - .ci-tron-x86_64-test
-  variables:
-    S3_ARTIFACT_NAME: "mesa-x86_64-asan-debugoptimized"
-    DEQP_FORCE_ASAN: 1
-    VKD3D_FORCE_ASAN: 1
-  needs:
-    - job: debian/x86_64_test-vk
-      artifacts: false
-      optional: true
-    - job: debian-x86_64-asan
-      artifacts: false
-
 .ci-tron-x86_64-test-vk-manual:
   extends:
     - .use-debian/x86_64_test-vk
@@ -124,17 +109,6 @@
     - job: debian-build-x86_64
       artifacts: false
 
-.ci-tron-x86_64-test-video:
-  extends:
-    - .use-debian/x86_64_test-video
-    - .ci-tron-x86_64-test
-  needs:
-    - job: debian/x86_64_test-video
-      artifacts: false
-      optional: true
-    - job: debian-x86_64
-      artifacts: false
-
 .ci-tron-x86_64-test-gl:
   extends:
     - .use-debian/x86_64_test-gl

.gitlab-ci/common/init-stage2.sh

@@ -41,11 +41,6 @@ trap cleanup INT TERM EXIT
 # background by this script
 BACKGROUND_PIDS=
 
-# Until we uniformize the install dir to /install, we need to make it
-# available to both possible CI_PROJECT_DIR paths.
-if [ "$GIT_STRATEGY" = empty ]; then
-  ln -s "$CI_PROJECT_DIR" "${CI_PROJECT_DIR%-empty}"
-fi
 
 for path in '/dut-env-vars.sh' '/set-job-env-vars.sh' './set-job-env-vars.sh'; do
     [ -f "$path" ] && source "$path"
@@ -59,12 +54,6 @@ echo
 
 section_switch init_stage2 "Pre-testing hardware setup"
 
-job_time=$(get_job_seconds)
-uptime=$(cut -d ' ' -f1 /proc/uptime)
-echo "$(get_current_minsec) after job start == $uptime sec after kernel boot time"
-printf -v uptime_rounded "%.0f" "$uptime"
-echo "Kernel boot occurred $((job_time-uptime_rounded)) seconds after job start"
-
 set -ex
 
 # Set up any devices required by the jobs
@@ -102,11 +91,6 @@ if [ -n "$HWCI_ENABLE_X86_KVM" ]; then
         modprobe ${KVM_KERNEL_MODULE}
 fi
 
-if ! [ -e /install/ ] && ! [ -e $CI_PROJECT_DIR/install/ ]; then
-  echo "Missing install/ dir"
-  exit 1
-fi
-
 # Fix prefix confusion: the build installs to $CI_PROJECT_DIR, but we expect
 # it in /install
 ln -sf $CI_PROJECT_DIR/install /install

.gitlab-ci/common/weston.sh

@@ -6,12 +6,7 @@ mkdir -p /tmp/.X11-unix
 export DISPLAY=:0
 
 WAYLAND_DISPLAY=wayland-0
-weston --config="$CI_COMMON_DIR/weston.ini" \
-  --socket="$WAYLAND_DISPLAY" \
-  --log "$RESULTS_DIR/weston.log" \
-  --logger-scopes=log,xwm-wm-x11 \
-  --width 1920 --height 1080 \
-  "$@" &
+weston --config="$CI_COMMON_DIR/weston.ini" --socket="$WAYLAND_DISPLAY" "$@" &
 export WAYLAND_DISPLAY
 
 while [ ! -S /tmp/.X11-unix/X0 ]; do sleep 1; done

.gitlab-ci/conditional-build-image-tags.yml

@@ -1,8 +1,7 @@
 variables:
-  CONDITIONAL_BUILD_ANDROID_CTS_TAG: 3e87ed2c4c2d00d764321eb26dd70f48
-  CONDITIONAL_BUILD_ANGLE_TAG: 7b3e621c5e2facd17452d013f1b55d98
-  CONDITIONAL_BUILD_CROSVM_TAG: 7edabf28bbd50e00558e3b0bb2d94255
+  CONDITIONAL_BUILD_ANDROID_CTS_TAG: 2dfd3e288249e4776ef6866d34d344d4
+  CONDITIONAL_BUILD_ANGLE_TAG: 02a4786ac57d3ea16744b7795ddcdb56
+  CONDITIONAL_BUILD_CROSVM_TAG: 4c61f9707203afca91db3efeb57175db
   CONDITIONAL_BUILD_FLUSTER_TAG: e13f8521875ebd70e207ec0f6f3d3e5b
-  CONDITIONAL_BUILD_PIGLIT_TAG: ca18ec9b1945c6ed69ecb5b3bcfb3479
-  CONDITIONAL_BUILD_VKD3D_PROTON_TAG: ad10b7da6e386de52f812c6370544ffa
-  CONDITIONAL_BUILD_WINE_TAG: 3376ef5f6160dbc502a7f8710a2eac27
+  CONDITIONAL_BUILD_PIGLIT_TAG: d027ff7015ba411736c1ac28a8663805
+  CONDITIONAL_BUILD_VKD3D_PROTON_TAG: 7d968889179351fcec5c1898fe3c1eff

.gitlab-ci/container/alpine/x86_64_build.sh

@@ -34,6 +34,7 @@ DEPS=(
     glslang
     graphviz
     libclc-dev
+    libdrm-dev
     libpciaccess-dev
     libva-dev
     linux-headers
@@ -71,8 +72,6 @@ pip3 install --break-system-packages sphinx===8.2.3 hawkmoth===0.19.0
 
 . .gitlab-ci/container/build-rust.sh build
 
-. .gitlab-ci/container/build-libdrm.sh
-
 EXTRA_MESON_ARGS='--prefix=/usr' \
 . .gitlab-ci/container/build-wayland.sh
 

.gitlab-ci/container/build-android-cts.sh

@@ -26,21 +26,18 @@ ci_tag_build_time_check "ANDROID_CTS_TAG"
 # This should be the union of all modules required by our CI jobs
 # Specific modules to run are selected via the ${GPU_VERSION}-android-cts-include.txt files
 ANDROID_CTS_MODULES=(
+    "CtsDeqpTestCases"
     "CtsGraphicsTestCases"
     "CtsNativeHardwareTestCases"
     "CtsSkQPTestCases"
 )
 
-ANDROID_CTS_VERSION="${ANDROID_VERSION}_r5"
-
-case "$ANDROID_ARCH" in
-  x86_64) ANDROID_CTS_ARCH=x86;;
-  arm64) ANDROID_CTS_ARCH=arm;;
-esac
+ANDROID_CTS_VERSION="${ANDROID_VERSION}_r3"
+ANDROID_CTS_DEVICE_ARCH="x86"
 
 # Download the stripped CTS from S3, because the CTS download from Google can take 20 minutes
-CTS_FILENAME="android-cts-${ANDROID_CTS_VERSION}-linux_x86-${ANDROID_CTS_ARCH}"
-ARTIFACT_PATH="${DATA_STORAGE_PATH}/android-cts/${DEBIAN_ARCH}/${ANDROID_CTS_TAG}.tar.zst"
+CTS_FILENAME="android-cts-${ANDROID_CTS_VERSION}-linux_x86-${ANDROID_CTS_DEVICE_ARCH}"
+ARTIFACT_PATH="${DATA_STORAGE_PATH}/android-cts/${ANDROID_CTS_TAG}.tar.zst"
 
 if FOUND_ARTIFACT_URL="$(find_s3_project_artifact "${ARTIFACT_PATH}")"; then
     echo "Found Android CTS at: ${FOUND_ARTIFACT_URL}"
@@ -60,13 +57,6 @@ else
     ANDROID_CTS_MODULES_KEEP_EXPRESSION=$(printf "%s|" "${ANDROID_CTS_MODULES[@]}" | sed -e 's/|$//g')
     find /android-cts/testcases/ -mindepth 1 -type d | grep -v -E "$ANDROID_CTS_MODULES_KEEP_EXPRESSION" | xargs rm -rf
 
-    # Android CTS bundles a JDK for x86_64 hosts.
-    # Replace this with the JDK we installed.
-    if [ "${DEBIAN_ARCH}" = "arm64" ]; then
-        rm -rf /android-cts/jdk
-        mv /usr/lib/jvm/java-21-openjdk-arm64 /android-cts/jdk
-    fi
-
     # Using zstd compressed tarball instead of zip, the compression ratio is almost the same, but
     # the extraction is faster, also LAVA overlays don't support zip compression.
     tar --zstd -cf "${CTS_FILENAME}.tar.zst" /android-cts

.gitlab-ci/container/build-angle.sh

@@ -13,7 +13,7 @@ section_start angle "Building ANGLE"
 # setting up the environment variables locally
 ci_tag_build_time_check "ANGLE_TAG"
 
-ANGLE_REV="196d1b79eadbd8fdbf0590092266bb2d87264988"
+ANGLE_REV="b406401e42080c2f8fe479e6c5fa48dfae97c482"
 DEPOT_REV="5982a1aeb33dc36382ed8c62eddf52a6135e7dd3"
 
 # Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined
@@ -129,57 +129,25 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
   # 'arm64' toolchain you get from Google infrastructure is a cross-compiler
   # from x86-64
   build/linux/sysroot_scripts/install-sysroot.py --arch=arm64
-
-  # The Bullseye sysroot is too old for Chromium's default PAC/BTI setup.
-  # Chromium forces -z force-bti on arm64, but our sysroot objects lack BTI
-  # notes, which breaks linking. Disable branch protection to keep the build
-  # sane. See:
-  # https://chromium.googlesource.com/chromium/src/build/+/7c4a6063/config/linux/BUILD.gn#87
-  # https://chromium.googlesource.com/chromium/src/build/+/7c4a6063/config/arm.gni#77
-  cat >> out/Release/args.gn <<EOF
-arm_control_flow_integrity="none"
-EOF
 fi
 
-# The Chromium build system hardcodes these flags, and they're not compatible
-# with our clang19 'unbundled' toolchain. See:
-# https://chromium.googlesource.com/chromium/src/build/+/71caaf82/config/compiler/BUILD.gn#604
-# https://chromium.googlesource.com/chromium/src/build/+/71caaf82/config/compiler/BUILD.gn#643
-# https://chromium.googlesource.com/chromium/src/build/+/42209031/config/sanitizers/sanitizers.gni#548
-sed -i '/-fdiagnostics-show-inlining-chain/d' build/config/compiler/BUILD.gn
-sed -i '/-fno-lifetime-dse/d' build/config/compiler/BUILD.gn
-sed -i '/-fsanitize-ignore-for-ubsan-feature=/d' build/config/sanitizers/sanitizers.gni
-
 (
   # The 'unbundled' toolchain configuration requires clang, and it also needs to
   # be configured via environment variables.
-  if [[ "$ANGLE_TARGET" == "linux" ]]; then
-    CC="$(command -v "clang-${LLVM_VERSION}")"
-    export CC
-    export HOST_CC="$CC"
-    export BUILD_CC="$CC"
-    export CFLAGS="-Wno-unknown-warning-option"
-    export HOST_CFLAGS="$CFLAGS"
-    export BUILD_CFLAGS="$CFLAGS"
-    CXX="$(command -v "clang++-${LLVM_VERSION}")"
-    export CXX
-    export HOST_CXX="$CXX"
-    export BUILD_CXX="$CXX"
-    export CXXFLAGS="-Wno-unknown-warning-option"
-    export HOST_CXXFLAGS="$CXXFLAGS"
-    export BUILD_CXXFLAGS="$CXXFLAGS"
-    AR="$(command -v ar)"
-    export AR
-    export HOST_AR="$AR"
-    export BUILD_AR="$AR"
-    NM="$(command -v nm)"
-    export NM
-    export HOST_NM="$NM"
-    export BUILD_NM="$NM"
-    export LDFLAGS="-fuse-ld=lld-${LLVM_VERSION} -lpthread -ldl"
-    export HOST_LDFLAGS="$LDFLAGS"
-    export BUILD_LDFLAGS="$LDFLAGS"
-  fi
+  export CC="clang-${LLVM_VERSION}"
+  export HOST_CC="$CC"
+  export CFLAGS="-Wno-unknown-warning-option"
+  export HOST_CFLAGS="$CFLAGS"
+  export CXX="clang++-${LLVM_VERSION}"
+  export HOST_CXX="$CXX"
+  export CXXFLAGS="-Wno-unknown-warning-option"
+  export HOST_CXXFLAGS="$CXXFLAGS"
+  export AR="ar"
+  export HOST_AR="$AR"
+  export NM="nm"
+  export HOST_NM="$NM"
+  export LDFLAGS="-fuse-ld=lld-${LLVM_VERSION} -lpthread -ldl"
+  export HOST_LDFLAGS="$LDFLAGS"
 
   gn gen out/Release
   # depot_tools overrides ninja with a version that doesn't work.  We want

.gitlab-ci/container/build-apitrace.sh

@@ -7,9 +7,9 @@
 
 set -uex
 
-section_start apitrace "Building apitrace"
+uncollapsed_section_start apitrace "Building apitrace"
 
-APITRACE_VERSION="18cfd388ac47a9e00978b34d6c20341f3e2cdb56"
+APITRACE_VERSION="45a005875d348b055d5b88dca285c109dee90457"
 
 git clone https://github.com/apitrace/apitrace.git --single-branch --no-checkout /apitrace
 pushd /apitrace

.gitlab-ci/container/build-bindgen.sh

@@ -6,7 +6,7 @@
 # DEBIAN_BUILD_TAG
 # FEDORA_X86_64_BUILD_TAG
 
-section_start bindgen "Building bindgen"
+uncollapsed_section_start bindgen "Building bindgen"
 
 BINDGEN_VER=0.71.1
 CBINDGEN_VER=0.26.0

.gitlab-ci/container/build-crosvm.sh

@@ -22,12 +22,12 @@ pushd /platform/crosvm
 git checkout "$CROSVM_VERSION"
 git submodule update --init
 
-VIRGLRENDERER_VERSION=37168812546aba59e79eb032d65e150c38ad3996
+VIRGLRENDERER_VERSION=95610d57da49d76617bd6d8d21b9bfb1bf360f64
 rm -rf third_party/virglrenderer
 git clone --single-branch -b main --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer
 pushd third_party/virglrenderer
 git checkout "$VIRGLRENDERER_VERSION"
-meson setup build/ -D libdir=lib -D venus=true ${EXTRA_MESON_ARGS:-}
+meson setup build/ -D libdir=lib -D render-server-worker=process -D venus=true ${EXTRA_MESON_ARGS:-}
 meson install -C build
 popd
 

.gitlab-ci/container/build-deqp-runner.sh

@@ -9,7 +9,7 @@ set -uex
 
 section_start deqp-runner "Building deqp-runner"
 
-DEQP_RUNNER_VERSION=0.23.2
+DEQP_RUNNER_VERSION=0.21.0
 
 commits_to_backport=(
 )

.gitlab-ci/container/build-deqp.sh

@@ -23,10 +23,10 @@ set -x
 # - the GL release produces `glcts`, and
 # - the GLES release produces `deqp-gles*` and `deqp-egl`
 
-DEQP_MAIN_COMMIT=634a3fc62d82c34de68c3b1add25e6b7f5777524
-DEQP_VK_VERSION=1.4.5.3
-DEQP_GL_VERSION=4.6.8.0
-DEQP_GLES_VERSION=3.2.14.0
+DEQP_MAIN_COMMIT=4d3bedc74e2258c483cf968753207cff84d9e4fc
+DEQP_VK_VERSION=1.4.4.2
+DEQP_GL_VERSION=4.6.7.0
+DEQP_GLES_VERSION=3.2.13.0
 
 # Patches to VulkanCTS may come from commits in their repo (listed in
 # cts_commits_to_backport) or patch files stored in our repo (in the patch
@@ -46,56 +46,12 @@ main_cts_patch_files=(
 
 # shellcheck disable=SC2034
 vk_cts_commits_to_backport=(
-  # Provide non-NULL setup slot for B frame tests
-  ebe05a88f36e3be8e232bfce97812353c396674a
-  # Fix enabling features in wsi incremental_present tests
-  fd8792395803546d03ee096f98fc20b21f22f047
-  # Check requirements in checkSupport, part 4 (draw module)
-  862a7d3c40be651aabc04913977db2cba6001ce9
-  # Check requirements in checkSupport, part 2 (spirv_assembly module)
-  fd3d404c142de4b0f68cb950b1a480c25c87c719
-  # Check requirements in checkSupport, part 1 (renderpass module)
-  3c6d790f5dd52f6e7a1d6a5264d5d4736c740b4c
-  # Check requirements in checkSupport, part 3 (ubo)
-  c2834cc642b55d4ffa3507a3ba3167862acb834b
-  # Add presentTimingSupported check
-  ef67ebbd16f8a5eb240227b172740e497887f057
-  # VulkanDisplayDirectDrm destructor for DRM direct display
-  d00394f5d14564a58d9e9a112ec04b8a38c36867
-  # Enable required extension for Vulkan 1.0
-  7cc6a1ad32e59861cb0a33f8b27646c41730c1b1
-  # Check requirements in checkSupport, part 7 (memory and memory_model modules)
-  59f04c088e30866e84f013a75029540b44d1f965
-  # Match VkImage size and render size for VkBindImageMemorySwapchainInfoKHR
-  1cf4ed5bc0620ea514404609b1a2958c4518b86d
-  # Add feature checks to present timing tests
-  7d783824ba621d9eab664f05e07143d8f88f27d5
-  # Allow VK_NOT_READY as a result of GetSwapchainTimingPropertiesEXT
-  84a468ec510060ff5af91822316562281e2d6d0a
-  # Fix crashing when vkAcquireDrmDisplayEXT fails
-  a3f15b1800d9b4892ad1776690abf5a1ac14efae
-  # accept VK_SUBOPTIMAL_KHR as success from vkAcquireNextImageKHR
-  46cb8b4dc7a45f2ec4aa4afc6dc5216fc24d570a
-  # Speedup sparse residency copies
-  a172173f1087a8c9229f4f16ef91f8ce0d00805b
-  # Add descriptor array/indexing feature checks
-  3f8cb8d341d9aed709a97493afac9c935d5afb81
-  # Fix for KHR_display query
-  ac8dc20073b2af60595615f661005c1f8680f4ee
-  # Delay shader object rendering test case creation to init method
-  e8f74066c15a2f94ec4457d75ab998d315a06bd7
-  # Fix invalid descriptor test
-  589820590126ca860dbbd0db26eb6bcdaa63dea0
-  # Fix validation errors found on qualcomm turnip
-  39ee33cd4be94216a9b657d089283b79767dc372
-  # Wait for sparse memory binds to finish in host image copy tests
-  976d729ae7982a32d117b0132e2bb8d3cd0df4d2
+  # Add an option to print to logcat in Android executable builds
+  fc51668efdfd0dffa30b3eddee34aa26172969fb
 )
 
 # shellcheck disable=SC2034
 vk_cts_patch_files=(
-  build-deqp-android-Implement-headless-WSI-fallback-using-AImageR.patch
-  build-deqp-Delay-SPIR-V-assembly-type-test-case-creation-to-ini.patch
 )
 
 # shellcheck disable=SC2034
@@ -104,22 +60,22 @@ gl_cts_commits_to_backport=(
 
 # shellcheck disable=SC2034
 gl_cts_patch_files=(
-  build-deqp-android-Implement-headless-WSI-fallback-using-AImageR.patch  # We're only applying this avoid conflicts in the second patch
   build-deqp-gl_Build-Don-t-build-Vulkan-utilities-for-GL-builds.patch
 )
 
 # shellcheck disable=SC2034
 # GLES builds also EGL
 gles_cts_commits_to_backport=(
+  # CMake: Include FindPkgConfig before using pkg_check_modules()
+  e09e0a210b041d0bf7b525620d0068eab3ffa66a
+  # Add an option to print to logcat in Android executable builds
+  fc51668efdfd0dffa30b3eddee34aa26172969fb
   # Fix EGL render tests for rgba16 and rgb16 unorm fixed point
   b5ed8718f19492781f8e9be3eb9d3346e961efa9
-  # Fix glGetnUniform* error codes when bufSize < 0
-  34259553e0cc77061465ae0c4bcd4c4658a0fb4a
 )
 
 # shellcheck disable=SC2034
 gles_cts_patch_files=(
-  build-deqp-android-Implement-headless-WSI-fallback-using-AImageR.patch
   build-deqp-gl_Build-Don-t-build-Vulkan-utilities-for-GL-builds.patch
 )
 
@@ -151,18 +107,7 @@ git checkout FETCH_HEAD
 DEQP_COMMIT=$(git rev-parse FETCH_HEAD)
 
 if [ "$DEQP_VERSION" = "$DEQP_MAIN_COMMIT" ]; then
-  for i in {5..1}; do
-    if merge_base=$(curl-with-retry -s https://api.github.com/repos/KhronosGroup/VK-GL-CTS/compare/main...$DEQP_MAIN_COMMIT | jq -e -r .merge_base_commit.sha); then
-      break
-    fi
-
-    if [ "$i" -eq 1 ]; then
-      echo "Final attempt to fetch merge base from GitHub failed. VK-GL-CTS GitHub API might be down or rate-limited."
-      exit 1
-    fi
-    sleep 10
-  done
-
+  merge_base="$(curl-with-retry -s https://api.github.com/repos/KhronosGroup/VK-GL-CTS/compare/main...$DEQP_MAIN_COMMIT | jq -r .merge_base_commit.sha)"
   if [[ "$merge_base" != "$DEQP_MAIN_COMMIT" ]]; then
     echo "VK-GL-CTS commit $DEQP_MAIN_COMMIT is not a commit from the main branch."
     exit 1

.gitlab-ci/container/build-directx-headers.sh

@@ -7,9 +7,9 @@
 
 set -uex
 
-section_start directx-headers "Building directx-headers"
+uncollapsed_section_start directx-headers "Building directx-headers"
 
-git clone https://github.com/microsoft/DirectX-Headers -b v1.619.1 --depth 1
+git clone https://github.com/microsoft/DirectX-Headers -b v1.618.1 --depth 1
 pushd DirectX-Headers
 meson setup build --backend=ninja --buildtype=release -Dbuild-test=false ${EXTRA_MESON_ARGS:-}
 meson install -C build

.gitlab-ci/container/build-fossilize.sh

@@ -6,7 +6,7 @@
 
 set -ex
 
-section_start fossilize "Building fossilize"
+uncollapsed_section_start fossilize "Building fossilize"
 
 git clone https://github.com/ValveSoftware/Fossilize.git
 cd Fossilize

.gitlab-ci/container/build-gfxreconstruct.sh

@@ -19,7 +19,7 @@ pushd /gfxreconstruct
 git checkout "$GFXRECONSTRUCT_VERSION"
 git submodule update --init
 git submodule update
-cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=/gfxreconstruct/build -DBUILD_WERROR=OFF -DGFXRECON_ENABLE_OPENXR=OFF
+cmake -S . -B _build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=/gfxreconstruct/build -DBUILD_WERROR=OFF
 cmake --build _build --parallel --target tools/{replay,info}/install/strip
 find . -not -path './build' -not -path './build/*' -delete
 popd

.gitlab-ci/container/build-gpu-trace-perf.sh

@@ -1,91 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_BASE_TAG
-
-set -uex
-
-section_start gpu-trace-perf "Building gpu-trace-perf"
-
-GPU_TRACE_PERF_VERSION=1.9.0
-
-commits_to_backport=(
-)
-
-patch_files=(
-)
-
-GPU_TRACE_PERF_GIT_URL="${GPU_TRACE_PERF_GIT_URL:-https://gitlab.freedesktop.org/anholt/gpu-trace-perf.git}"
-if [ -n "${GPU_TRACE_PERF_GIT_TAG:-}" ]; then
-    GPU_TRACE_PERF_GIT_CHECKOUT="$GPU_TRACE_PERF_GIT_TAG"
-elif [ -n "${GPU_TRACE_PERF_GIT_REV:-}" ]; then
-    GPU_TRACE_PERF_GIT_CHECKOUT="$GPU_TRACE_PERF_GIT_REV"
-else
-    GPU_TRACE_PERF_GIT_CHECKOUT="v$GPU_TRACE_PERF_VERSION"
-fi
-
-BASE_PWD=$PWD
-
-mkdir -p /gpu-trace-perf
-pushd /gpu-trace-perf
-mkdir gpu-trace-perf-git
-pushd gpu-trace-perf-git
-git init
-git remote add origin "$GPU_TRACE_PERF_GIT_URL"
-git fetch --depth 1 origin "$GPU_TRACE_PERF_GIT_CHECKOUT"
-git checkout FETCH_HEAD
-
-for commit in "${commits_to_backport[@]}"
-do
-  PATCH_URL="https://gitlab.freedesktop.org/anholt/gpu-trace-perf/-/commit/$commit.patch"
-  echo "Backport gpu-trace-perf commit $commit from $PATCH_URL"
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 $PATCH_URL | git am
-done
-
-for patch in "${patch_files[@]}"
-do
-  echo "Apply patch to gpu-trace-perf from $patch"
-  git am "$BASE_PWD/.gitlab-ci/container/patches/$patch"
-done
-
-if [ -z "${RUST_TARGET:-}" ]; then
-    RUST_TARGET=""
-fi
-
-if [[ "$RUST_TARGET" != *-android ]]; then
-    # When CC (/usr/lib/ccache/gcc) variable is set, the rust compiler uses
-    # this variable when cross-compiling arm32 and build fails for zsys-sys.
-    # So unset the CC variable when cross-compiling for arm32.
-    SAVEDCC=${CC:-}
-    if [ "$RUST_TARGET" = "armv7-unknown-linux-gnueabihf" ]; then
-        unset CC
-    fi
-    cargo install --locked  \
-        -j ${FDO_CI_CONCURRENT:-4} \
-        --root /usr/local \
-        ${EXTRA_CARGO_ARGS:-} \
-        --path .
-    CC=$SAVEDCC
-else
-    cargo install --locked  \
-        -j ${FDO_CI_CONCURRENT:-4} \
-        --root /usr/local --version 2.10.0 \
-        cargo-ndk
-
-    rustup target add $RUST_TARGET
-    RUSTFLAGS='-C target-feature=+crt-static' cargo ndk --target $RUST_TARGET build --release
-
-    mv target/$RUST_TARGET/release/gpu-trace-perf /gpu-trace-perf
-
-    cargo uninstall --locked  \
-        --root /usr/local \
-        cargo-ndk
-fi
-
-popd
-rm -rf gpu-trace-perf-git
-popd
-
-section_end gpu-trace-perf

.gitlab-ci/container/build-kdl.sh

@@ -3,7 +3,7 @@
 
 set -ex
 
-section_start kdl "Building kdl"
+uncollapsed_section_start kdl "Building kdl"
 
 KDL_REVISION="42218ba7297a28d64ddd1d4b5f200a60b3659d42"
 KDL_CHECKOUT_DIR="/tmp/ci-kdl.git"

.gitlab-ci/container/build-libclc.sh

@@ -2,7 +2,7 @@
 
 set -uex
 
-section_start libclc "Building libclc"
+uncollapsed_section_start libclc "Building libclc"
 
 export LLVM_CONFIG="llvm-config-${LLVM_VERSION:?"llvm unset!"}"
 LLVM_TAG="llvmorg-15.0.7"

.gitlab-ci/container/build-libdrm.sh

@@ -5,9 +5,9 @@
 
 set -uex
 
-section_start libdrm "Building libdrm"
+uncollapsed_section_start libdrm "Building libdrm"
 
-export LIBDRM_VERSION=libdrm-2.4.133
+export LIBDRM_VERSION=libdrm-2.4.122
 
 curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
     https://dri.freedesktop.org/libdrm/"$LIBDRM_VERSION".tar.xz

.gitlab-ci/container/build-llvm-spirv.sh

@@ -2,7 +2,7 @@
 
 set -ex
 
-section_start llvm-spirv "Building LLVM-SPIRV-Translator"
+uncollapsed_section_start llvm-spirv "Building LLVM-SPIRV-Translator"
 
 if [ "${LLVM_VERSION:?llvm version not set}" -ge 18 ]; then
   VER="${LLVM_VERSION}.1.0"

.gitlab-ci/container/build-piglit.sh

@@ -13,7 +13,7 @@ section_start piglit "Building piglit"
 # setting up the environment variables locally
 ci_tag_build_time_check "PIGLIT_TAG"
 
-REV="6fd29fe44f8857b876a67bee962919635f22ecc8"
+REV="62d499d63d2b8b29a67efd9d93ed9b6a94d4950e"
 
 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit

.gitlab-ci/container/build-shader-db.sh

@@ -6,7 +6,7 @@
 
 set -ex
 
-section_start shader-db "Building shader-db"
+uncollapsed_section_start shader-db "Building shader-db"
 
 pushd /usr/local
 git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1

.gitlab-ci/container/build-skqp.sh

@@ -10,7 +10,7 @@
 
 set -uex
 
-section_start skqp "Building SkQP"
+uncollapsed_section_start skqp "Building SkQP"
 
 SKQP_BRANCH=android-cts-12.1_r5
 

.gitlab-ci/container/build-vkd3d-proton.sh

@@ -11,35 +11,43 @@ section_start vkd3d-proton "Building vkd3d-proton"
 # setting up the environment variables locally
 ci_tag_build_time_check "VKD3D_PROTON_TAG"
 
-VKD3D_PROTON_COMMIT="97a834b8473e700f3cb15567ba5f90b2236ecfc5"
+VKD3D_PROTON_COMMIT="9ca0b9c076a01b5b7c046cb9a4fa9834c555eed3"
 
 VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests"
 VKD3D_PROTON_SRC_DIR="/vkd3d-proton-src"
+VKD3D_PROTON_BUILD_DIR="/vkd3d-proton-build"
+VKD3D_PROTON_WINE_DIR="/vkd3d-proton-wine64"
 VKD3D_PROTON_S3_ARTIFACT="vkd3d-proton.tar.zst"
 
-mkdir -p "$VKD3D_PROTON_SRC_DIR"
+if [ ! -d "$VKD3D_PROTON_WINE_DIR" ]; then
+  echo "Fatal: Directory '$VKD3D_PROTON_WINE_DIR' does not exist. Aborting."
+  exit 1
+fi
+
+git clone https://github.com/HansKristian-Work/vkd3d-proton.git --single-branch -b master --no-checkout "$VKD3D_PROTON_SRC_DIR"
 pushd "$VKD3D_PROTON_SRC_DIR"
-git init
-git remote add origin https://github.com/HansKristian-Work/vkd3d-proton.git
-git fetch --depth 1 origin "$VKD3D_PROTON_COMMIT"
-git checkout FETCH_HEAD
+git checkout "$VKD3D_PROTON_COMMIT"
 git submodule update --init --recursive
+git submodule update --recursive
 
-meson setup build --buildtype release -D enable_tests=true \
-      -D c_args=-Wno-error=incompatible-pointer-types
-# Build and install specifically the bits we want; gets rid of 24MB of
-# unwanted files, keeping only 7.6MB of the three useful files.
-for file in \
-  libs/d3d12/libvkd3d-proton-d3d12.so \
-  libs/d3d12core/libvkd3d-proton-d3d12core.so \
-  tests/d3d12 \
-; do
-  ninja -C build "$file"
-  strip build/"$file"
-  install -Dm755 -t "${VKD3D_PROTON_DST_DIR}/$(dirname "$file")" build/"$file"
-done
+meson setup                                           \
+      -D c_args=-Wno-error=incompatible-pointer-types \
+      -D enable_tests=true                            \
+      --buildtype release                             \
+      --prefix "$VKD3D_PROTON_DST_DIR"                \
+      --strip                                         \
+      --libdir "lib"                                  \
+      "$VKD3D_PROTON_BUILD_DIR/build"
 
-install -m755 -t "${VKD3D_PROTON_DST_DIR}/tests" tests/test-runner.sh
+ninja -C "$VKD3D_PROTON_BUILD_DIR/build" install
+
+install -m755 -t "${VKD3D_PROTON_DST_DIR}/" "$VKD3D_PROTON_BUILD_DIR/build/tests/d3d12"
+
+mkdir "$VKD3D_PROTON_DST_DIR/tests"
+cp \
+  "tests/test-runner.sh" \
+  "tests/d3d12_tests.h" \
+  "$VKD3D_PROTON_DST_DIR/tests/"
 popd
 
 # Archive and upload vkd3d-proton for use as a LAVA overlay, if the archive doesn't exist yet
@@ -48,12 +56,13 @@ if FOUND_ARTIFACT_URL="$(find_s3_project_artifact "${ARTIFACT_PATH}")"; then
   echo "Found vkd3d-proton at: ${FOUND_ARTIFACT_URL}, skipping upload"
 else
   echo "Uploaded vkd3d-proton not found, reuploading..."
-  tar --zstd -cf "$VKD3D_PROTON_S3_ARTIFACT" -C / "${VKD3D_PROTON_DST_DIR#/}"
+  tar --zstd -cf "$VKD3D_PROTON_S3_ARTIFACT" -C / "${VKD3D_PROTON_DST_DIR#/}" "${VKD3D_PROTON_WINE_DIR#/}"
   ci-fairy s3cp --token-file "${S3_JWT_FILE}" "$VKD3D_PROTON_S3_ARTIFACT" \
     "https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${ARTIFACT_PATH}"
   rm "$VKD3D_PROTON_S3_ARTIFACT"
 fi
 
+rm -rf "$VKD3D_PROTON_BUILD_DIR"
 rm -rf "$VKD3D_PROTON_SRC_DIR"
 
 section_end vkd3d-proton

.gitlab-ci/container/build-vulkan-validation.sh

@@ -6,9 +6,9 @@
 
 set -uex
 
-section_start vulkan-validation "Building Vulkan validation layers"
+uncollapsed_section_start vulkan-validation "Building Vulkan validation layers"
 
-VALIDATION_TAG="2ab77a01659e3e46d6ca8a25425b19b3425adb11"
+VALIDATION_TAG="f384bd565c752f53aae10849aff6ffeb035d9ec4"
 
 mkdir Vulkan-ValidationLayers
 pushd Vulkan-ValidationLayers

.gitlab-ci/container/build-wayland.sh

@@ -3,11 +3,13 @@
 
 set -uex
 
-section_start wayland "Building Wayland"
+uncollapsed_section_start wayland "Building Wayland"
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
 # ALPINE_X86_64_BUILD_TAG
+# DEBIAN_BUILD_TAG
+# DEBIAN_TEST_BASE_TAG
 # FEDORA_X86_64_BUILD_TAG
 
 export LIBWAYLAND_VERSION="1.24.0"

.gitlab-ci/container/build-wine.sh

@@ -1,174 +0,0 @@
-#!/bin/bash
-
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_VK_TAG
-set -eux
-
-# This script sets up the wine components and the wine prefix that will be used
-# when running wine.  All of this gets bundled up into a tarball that's
-# conditionally overlaid on LAVA runners when we need wine (container-based jobs
-# will have the wine contents in them).  Everything that's included in the
-# WINE_S3_ARTIFACT (other than the debian wine packages) must go in this script,
-# because that determines the cached hash it's uploaded under for LAVA runners.
-
-section_start wine "Setting up Wine"
-
-# Do a very early check to make sure the tag is correct without the need of
-# setting up the environment variables locally
-ci_tag_build_time_check "WINE_TAG"
-
-export WINEPREFIX="/wineprefix"
-export WINEDEBUG="-all"
-
-# We don't want crash dialogs
-cat >crashdialog.reg <<EOF
-Windows Registry Editor Version 5.00
-
-[HKEY_CURRENT_USER\Software\Wine\WineDbg]
-"ShowCrashDialog"=dword:00000000
-
-EOF
-
-# Set the wine prefix and disable the crash dialog
-wine regedit crashdialog.reg
-rm crashdialog.reg
-
-# An immediate wine command may fail with: "${WINEPREFIX}: Not a
-# valid wine prefix."  and that is just spit because of checking
-# the existance of the system.reg file, which fails.  Just giving
-# it a bit more of time for it to be created solves the problem
-# ...
-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
-
-section_start DXVK "Installing DXVK"
-
-set -uex
-
-overrideDll() {
-  if ! wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$1" /d native /f; then
-    echo -e "Failed to add override for $1"
-    exit 1
-  fi
-}
-
-dxvk_install_release() {
-    local DXVK_VERSION=${1:?}
-
-    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-	-O "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VERSION}/dxvk-${DXVK_VERSION}.tar.gz"
-    tar xzpf dxvk-"${DXVK_VERSION}".tar.gz
-    cp "dxvk-${DXVK_VERSION}"/x64/*.dll "$WINEPREFIX/drive_c/windows/system32/"
-    rm -rf "dxvk-${DXVK_VERSION}"
-    rm dxvk-"${DXVK_VERSION}".tar.gz
-}
-
-# DXVK upstream only builds for x64/x32, so we snag arm64 binaries out of
-# another project that packages it as arm64 and arm64ec.
-dxvk_install_hangover() {
-    local DXVK_VERSION=${1:?}
-    local HANGOVER_VERSION=${2:?}
-
-    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-        -o hangover_dlls.tar \
-	-O "https://github.com/AndreRH/hangover/releases/download/hangover-${HANGOVER_VERSION}/hangover_${HANGOVER_VERSION}_dlls.tar"
-    tar xpf hangover_dlls.tar
-    rm hangover_dlls.tar
-
-    tar xpf "dxvk-v${DXVK_VERSION}.tar.gz"
-    rm "dxvk-v${DXVK_VERSION}.tar.gz"
-
-    cp "dxvk-v${DXVK_VERSION}"/aarch64/*.dll "$WINEPREFIX/drive_c/windows/system32/"
-    rm -rf "dxvk-v${DXVK_VERSION}"
-}
-
-if [ "$DEBIAN_ARCH" != arm64 ]; then
-  # x32 and x64 binaries
-  dxvk_install_release "2.7.1"
-else
-  # Use another packager's tarball for ARM binaries, since upstream DXVK doesn't
-  # generate them.
-  dxvk_install_hangover "2.7.1" "11.4"
-fi
-
-overrideDll d3d8
-overrideDll d3d9
-overrideDll d3d10core
-overrideDll d3d11
-overrideDll dxgi
-
-# make sure the registry keys are flushed.
-wineserver -k
-
-section_end DXVK
-
-section_start Renderdoc "Installing Renderdoc"
-
-renderdoc_install_upstream() {
-    local RDC_VERSION=${1:?}
-
-    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-	-O "https://renderdoc.org/stable/${RDC_VERSION}/RenderDoc_${RDC_VERSION}_64.zip"
-    unzip "RenderDoc_${RDC_VERSION}_64.zip"
-    mv "RenderDoc_${RDC_VERSION}_64/" /renderdoc-win64
-}
-
-# renderdoc doesn't have ARM64 binaries, so grab a snapshot of a build from a Linaro dev.
-renderdoc_install_arm() {
-    # anholt's copy is a snapshot of the google drive link from https://linaro.atlassian.net/wiki/spaces/WOAR/pages/30353719316/RenderDoc
-    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-        -o renderdoc_arm64.7z \
-	-O "https://people.freedesktop.org/~anholt/renderdoc-arm64-anthony-linaro-snapshot.7z"
-
-    mkdir /renderdoc-win64
-    7z -o/renderdoc-win64 x renderdoc_arm64.7z
-}
-if [ "$DEBIAN_ARCH" != arm64 ]; then
-  renderdoc_install_upstream "1.43"
-else
-  renderdoc_install_arm
-fi
-# Clean up large binaries we won't use.
-rm /renderdoc-win64/qrenderdoc.exe
-
-section_end Renderdoc
-
-
-# Archive and upload wine for use as a LAVA overlay, if the archive doesn't exist yet
-WINE_S3_ARTIFACT="wine.tar.zst"
-ARTIFACT_PATH="${DATA_STORAGE_PATH}/wine/${DEBIAN_TEST_VK_TAG}-${WINE_TAG}/${CI_JOB_NAME}/${WINE_S3_ARTIFACT}"
-if FOUND_ARTIFACT_URL="$(find_s3_project_artifact "${ARTIFACT_PATH}")"; then
-  echo "Found wine at: ${FOUND_ARTIFACT_URL}, skipping upload"
-else
-  echo "Uploaded wine not found, reuploading..."
-  tar --zstd -cf "$WINE_S3_ARTIFACT" -C / \
-    "${WINEPREFIX#/}" \
-    /apitrace-msvc-win64 \
-    /renderdoc-win64 \
-    /usr/lib/*/wine
-  ci-fairy s3cp --token-file "${S3_JWT_FILE}" "$WINE_S3_ARTIFACT" \
-    "https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${ARTIFACT_PATH}"
-  rm "$WINE_S3_ARTIFACT"
-fi

.gitlab-ci/container/build-xwayland.sh

@@ -3,7 +3,7 @@
 
 set -uex
 
-section_start xwayland "Building XWayland"
+uncollapsed_section_start xwayland "Building XWayland"
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:

.gitlab-ci/container/cross_build.sh

@@ -25,12 +25,6 @@ DEPS=(
     "libpciaccess-dev:$arch"
     "libstdc++6:$arch"
     "libvulkan-dev:$arch"
-    "libwayland-client0:$arch"
-    "libwayland-cursor0:$arch"
-    "libwayland-dev:$arch"
-    "libwayland-egl1:$arch"
-    "libwayland-egl-backend-dev:$arch"
-    "libwayland-server0:$arch"
     "libx11-dev:$arch"
     "libx11-xcb-dev:$arch"
     "libxcb-dri2-0-dev:$arch"
@@ -45,7 +39,6 @@ DEPS=(
     "libxrandr-dev:$arch"
     "libxshmfence-dev:$arch"
     "libxxf86vm-dev:$arch"
-    "wayland-protocols:$arch"
 )
 
 dpkg --add-architecture $arch
@@ -85,6 +78,8 @@ fi
 # dependencies where we want a specific version
 MULTIARCH_PATH=$(dpkg-architecture -A $arch -qDEB_TARGET_MULTIARCH)
 export EXTRA_MESON_ARGS="--cross-file=/cross_file-${arch}.txt -D libdir=lib/${MULTIARCH_PATH}"
+. .gitlab-ci/container/build-wayland.sh
+
 . .gitlab-ci/container/build-directx-headers.sh
 
 apt-get purge -y "${EPHEMERAL[@]}"

.gitlab-ci/container/debian/arm64_build.sh

@@ -53,7 +53,6 @@ DEPS=(
     libexpat1-dev
     libflatbuffers-dev
     "libllvm${LLVM_VERSION}"
-    libpng-dev
     libvulkan-dev
     libx11-dev
     libx11-xcb-dev
@@ -70,7 +69,6 @@ DEPS=(
     libxshmfence-dev
     libxtensor-dev
     libxxf86vm-dev
-    libwayland-bin
     libwayland-dev
     libwayland-egl-backend-dev
     "llvm-${LLVM_VERSION}-dev"
@@ -86,7 +84,6 @@ DEPS=(
     python3-venv
     shellcheck
     u-boot-tools
-    wayland-protocols
     xz-utils
     yamllint
     zlib1g-dev
@@ -112,6 +109,8 @@ arch=armhf
 
 . .gitlab-ci/container/build-mold.sh
 
+. .gitlab-ci/container/build-wayland.sh
+
 . .gitlab-ci/container/build-llvm-spirv.sh
 
 . .gitlab-ci/container/build-libclc.sh

.gitlab-ci/container/debian/arm64_test-android-tools.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-ANDROID_ARCH=arm64 \
-BUILD_CONTAINER=true \
-TEST_CONTAINER=false \
-DEBIAN_ARCH=amd64 \
-. .gitlab-ci/container/debian/test-android.sh

.gitlab-ci/container/debian/arm64_test-android.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-ANDROID_ARCH=arm64 \
-BUILD_CONTAINER=false \
-TEST_CONTAINER=true \
-DEBIAN_ARCH=arm64 \
-. .gitlab-ci/container/debian/test-android.sh

.gitlab-ci/container/debian/gitlab-ci.yml

@@ -185,7 +185,7 @@ debian/s390x_build:
     LLVM_VERSION: &debian-android-llvm 19
     CUTTLEFISH_PROJECT_PATH: gfx-ci/android/aosp-manifest
     CUTTLEFISH_BUILD_VERSION_TAGS: mesa-venus
-    CUTTLEFISH_BUILD_NUMBER: 20260427.001
+    CUTTLEFISH_BUILD_NUMBER: 20260108.001
 
 # Android NDK cross-build image
 debian/android_build:
@@ -527,51 +527,6 @@ debian/arm64_test-vk:
     - job: debian/arm64_test-vk
       optional: true
 
-# Debian-based x86_64 builder for Android test tools.
-# ANGLE, dEQP, and deqp-runner are built here since Google does not provide
-# an arm64 NDK. Artifacts are then copied into the arm64 test image.
-debian/arm64_test-android-tools:
-  extends:
-    - .android-variables
-    - .use-debian/x86_64_test-base  # NOT a mistake!
-    - .container-builds-android
-  variables:
-    MESA_IMAGE_TAG: &debian-arm64_test-android ${DEBIAN_TEST_ANDROID_TAG}
-
-# Debian based arm64 test image for Android
-debian/arm64_test-android:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  extends:
-    - .android-variables
-    - .use-debian/arm64_test-base
-    - .container-builds-android
-    - .export-container
-  variables:
-    MESA_IMAGE_TAG: *debian-arm64_test-android
-  needs:
-    - !reference [.use-debian/arm64_test-base, needs]
-    - job: debian/arm64_test-android-tools
-      optional: true
-
-.use-debian/arm64_test-android:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_AARCH64
-  extends:
-    - .android-variables
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-arm64_test-base
-    MESA_IMAGE_PATH: "debian/arm64_test-android"
-    MESA_IMAGE_TAG: *debian-arm64_test-android
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/arm64_test-android
-      optional: true
-    - job: debian/arm64_test-android-tools
-      optional: true
-
 # x86_64 image with ARM64 & ARM32 kernel & rootfs for baremetal testing
 .debian/baremetal_arm_test:
   extends:

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

@@ -1,261 +0,0 @@
-#!/usr/bin/env bash
-# The relative paths in this file only become valid at runtime.
-# shellcheck disable=SC1091
-#
-# When changing this file, you need to bump the following
-# .gitlab-ci/image-tags.yml tags:
-# DEBIAN_TEST_ANDROID_TAG
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-set -o xtrace
-
-section_start debian_setup "Base Debian system setup"
-
-export DEBIAN_FRONTEND=noninteractive
-
-# Google provides Android NDK for x86_64 hosts only; there is no arm64-native NDK for Linux.
-# Thus, we must cross-compile arm64 test tools on x86_64 runners.
-
-# Container Variants Overview:
-# - x86_64_test-android: Comprehensive environment for x86_64 testing.
-# - arm64_test-android-tools: Used to cross-compile arm64 binaries (dEQP, ANGLE, etc)
-#   on x86_64 runners because the Android NDK only provides x86_64 host binaries.
-# - arm64_test-android: Fetches components built by the 'tools' container to run
-#   tests on arm64 devices where full builds are unsupported.
-#
-# | Component            | x86_64_test-android | arm64_test-android-tools | arm64_test-android |
-# | :------------------: | :-----------------: | :----------------------: | :----------------: |
-# | Runner arch          | x86_64              | x86_64                   | arm64              |
-# | Android NDK          | ✔                   | ✔                        |                    |
-# | ANGLE / dEQP         | ✔ (Built)           | ✔ (Built)                | ✔ (Downloaded)     |
-# | eglinfo / vulkaninfo | ✔                   |                          | ✔                  |
-# | Cuttlefish / CTS     | ✔ (Included)        |                          |   (LAVA overlay)   |
-# | Runtime Deps (AAPT)  | ✔                   |                          | ✔                  |
-#
-# | Logic Variable       | x86_64_test-android | arm64_test-android-tools | arm64_test-android |
-# | :------------------: | :-----------------: | :----------------------: | :----------------: |
-# | BUILD_CONTAINER      | ✔                   | ✔                        |                    |
-# | TEST_CONTAINER       | ✔                   |                          | ✔                  |
-
-if "${BUILD_CONTAINER}"; then
-  # Ephemeral packages (installed for this script and removed again at the end)
-  EPHEMERAL=(
-      binutils-aarch64-linux-gnu
-      build-essential:native
-      ccache
-      cmake
-      config-package-dev
-      debhelper-compat
-      dpkg-dev
-      ninja-build
-      unzip
-  )
-else
-  # We only need the build tools in build containers
-  EPHEMERAL=(
-      unzip
-  )
-fi
-
-if "${TEST_CONTAINER}"; then
-  # We only need the Cuttlefish runtime dependencies in test containers
-  DEPS=(
-      aapt
-      cuttlefish-base
-      cuttlefish-user
-      iproute2
-  )
-  # Android CTS only comes with x86_64 Java bundled, so we need to install it on arm64
-  if [ "${DEBIAN_ARCH}" = "arm64" ]; then
-    DEPS+=(openjdk-21-jdk-headless)
-  fi
-else
-  DEPS=()
-fi
-
-apt-get install -y --no-remove --no-install-recommends \
-      "${DEPS[@]}" "${EPHEMERAL[@]}"
-
-############### Building ...
-
-. .gitlab-ci/container/container_pre_build.sh
-
-section_end debian_setup
-
-if [ "${ANDROID_ARCH}" = "x86_64" ]; then
-  export RUST_TARGET=x86_64-linux-android
-  export ANDROID_ABI=x86_64
-  export ANGLE_ARCH=x64
-fi
-
-if [ "${ANDROID_ARCH}" = "arm64" ]; then
-  export RUST_TARGET=aarch64-linux-android
-  export ANDROID_ABI=arm64-v8a
-  export ANGLE_ARCH=arm64
-  export STRIP_CMD=aarch64-linux-gnu-strip
-fi
-
-############### Downloading Android tools
-
-section_start android-tools "Downloading Android tools"
-
-# Download pre-built Android utility binaries (eglinfo, vulkaninfo) for test environments
-if "${TEST_CONTAINER}"; then
-  mkdir /android-tools
-  pushd /android-tools
-
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -o eglinfo "https://${S3_HOST}/${S3_ANDROID_BUCKET}/mesa/mesa/${DATA_STORAGE_PATH}/eglinfo-android-${ANDROID_ARCH}"
-  chmod +x eglinfo
-
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -o vulkaninfo "https://${S3_HOST}/${S3_ANDROID_BUCKET}/mesa/mesa/${DATA_STORAGE_PATH}/vulkaninfo-android-${ANDROID_ARCH}"
-  chmod +x vulkaninfo
-
-  popd
-fi
-
-# Fetch cross-compiled test tools (ANGLE, dEQP) for the arm64 runtime.
-# These were built in the 'tools' container due to NDK host limitations.
-if ! "${BUILD_CONTAINER}"; then
-  curl-with-retry -O "https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${DEBIAN_TEST_ANDROID_TAG}/android-tools-arm64.tar.zst"
-  tar --zstd -xf android-tools-arm64.tar.zst -C /
-  rm android-tools-arm64.tar.zst
-fi
-
-section_end android-tools
-
-############### Downloading NDK for native builds for the guest ...
-
-# Skip NDK setup and builds for test-only runtimes
-if "${BUILD_CONTAINER}"; then
-  section_start android-ndk "Downloading Android NDK"
-
-  # Fetch the NDK and extract just the toolchain we want.
-  ndk="android-ndk-${ANDROID_NDK_VERSION}"
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -o "$ndk.zip" "https://dl.google.com/android/repository/$ndk-linux.zip"
-  unzip -q -d / "$ndk.zip"
-    rm "$ndk.zip"
-
-  section_end android-ndk
-
-  ############### Build ANGLE
-
-  ANGLE_TARGET=android \
-  . .gitlab-ci/container/build-angle.sh
-
-  ############### Build dEQP runner
-
-  export ANDROID_NDK_HOME=/$ndk
-  . .gitlab-ci/container/build-rust.sh test
-  . .gitlab-ci/container/build-deqp-runner.sh
-
-  # Properly uninstall rustup including cargo and init scripts on shells
-  rustup self uninstall -y
-
-  ############### Build dEQP
-
-  DEQP_API=tools \
-  DEQP_TARGET="android" \
-  EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=${ANDROID_ABI} -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
-  . .gitlab-ci/container/build-deqp.sh
-
-  DEQP_API=GLES \
-  DEQP_TARGET="android" \
-  EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_ANDROID_EXE_LOGCAT=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=${ANDROID_ABI} -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
-  . .gitlab-ci/container/build-deqp.sh
-
-  DEQP_API=VK \
-  DEQP_TARGET="android" \
-  EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_ANDROID_EXE_LOGCAT=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=${ANDROID_ABI} -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
-  . .gitlab-ci/container/build-deqp.sh
-
-  rm -rf /VK-GL-CTS
-fi
-
-############### Downloading Cuttlefish resources ...
-
-# We only need to download the Cuttlefish image and host tools for the shared runners on x86_64, otherwise they are deployed as LAVA overlays
-if [ "${ANDROID_ARCH}" = "x86_64" ]; then
-  section_start cuttlefish "Downloading and setting up Cuttlefish"
-
-  mkdir /cuttlefish
-  pushd /cuttlefish
-
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -O "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/aosp_cf_${ANDROID_ARCH}_only_phone-img-${CUTTLEFISH_BUILD_NUMBER}.tar.zst"
-
-  tar --zstd -xvf "aosp_cf_${ANDROID_ARCH}_only_phone-img-${CUTTLEFISH_BUILD_NUMBER}.tar.zst"
-  rm "aosp_cf_${ANDROID_ARCH}_only_phone-img-${CUTTLEFISH_BUILD_NUMBER}.tar.zst"
-
-  curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
-    -O "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/cvd-host_package-${ANDROID_ARCH}.tar.zst"
-  tar --zst -xvf "cvd-host_package-${ANDROID_ARCH}.tar.zst"
-  rm "cvd-host_package-${ANDROID_ARCH}.tar.zst"
-
-  popd
-
-  section_end cuttlefish
-fi
-
-if "${TEST_CONTAINER}"; then
-  addgroup --system kvm
-  usermod -a -G kvm,cvdnetwork root
-fi
-
-############### Downloading Android CTS
-
-if "${TEST_CONTAINER}"; then
-. .gitlab-ci/container/build-android-cts.sh
-fi
-
-############### Packaging arm64 tools for S3 upload
-
-# Upload cross-compiled arm64 binaries to S3 for consumption by the test runtime container
-if ! "${TEST_CONTAINER}"; then
-  section_start android-tools-arm64 "Uploading Android tools"
-
-  TOOL_DIRS=(
-      /angle
-      /deqp-gles
-      /deqp-runner
-      /deqp-tools
-      /deqp-vk
-      /mesa-ci-build-tag
-  )
-
-  tar --zstd -cf android-tools-arm64.tar.zst "${TOOL_DIRS[@]}"
-
-  ci-fairy s3cp --token-file "${S3_JWT_FILE}" "android-tools-arm64.tar.zst" \
-    "https://${S3_BASE_PATH}/${CI_PROJECT_PATH}/${DEBIAN_TEST_ANDROID_TAG}/android-tools-arm64.tar.zst"
-
-  section_end android-tools-arm64
-fi
-
-############### Uninstall the build software
-
-section_switch debian_cleanup "Cleaning up base Debian system"
-
-if "${BUILD_CONTAINER}"; then
-  rm -rf "/${ndk:?}"
-fi
-
-# We currently only have LAVA jobs on arm64, where we deploy Android CTS as a LAVA overlay.
-# Remove it from the container image to save some space.
-if "${TEST_CONTAINER}" &&  [ "${DEBIAN_ARCH}" = "arm64" ]; then
-  rm -rf "/android-cts"
-fi
-
-apt-get purge -y "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/container_post_build.sh
-
-section_end debian_cleanup
-
-############### Remove unused packages
-
-. .gitlab-ci/container/strip-rootfs.sh

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

@@ -11,7 +11,7 @@ set -e
 
 set -o xtrace
 
-section_start debian_setup "Base Debian system setup"
+uncollapsed_section_start debian_setup "Base Debian system setup"
 
 export DEBIAN_FRONTEND=noninteractive
 
@@ -89,6 +89,7 @@ EPHEMERAL=(
     python3-setuptools
     python3-venv
     python3-wheel
+    wayland-protocols
     xz-utils
 )
 
@@ -123,11 +124,7 @@ DEPS=(
     libtirpc3t64
     libubsan1
     libvulkan1
-    libwayland-bin
     libwayland-client0
-    libwayland-cursor0
-    libwayland-dev
-    libwayland-egl1
     libwayland-server0
     libxcb-composite0
     libxcb-dri2-0
@@ -160,7 +157,6 @@ DEPS=(
     sysvinit-core
     vulkan-tools
     waffle-utils
-    wayland-protocols
     xinit
     xserver-common
     xserver-xorg-video-amdgpu
@@ -213,6 +209,10 @@ section_end debian_setup
 
 . .gitlab-ci/container/build-libclc.sh
 
+############### Build Wayland
+
+. .gitlab-ci/container/build-wayland.sh
+
 ############### Build Weston
 
 . .gitlab-ci/container/build-weston.sh
@@ -232,21 +232,17 @@ if [ "$DEBIAN_ARCH" != "armhf" ]; then
   . .gitlab-ci/container/build-crosvm.sh
 fi
 
-############### Build dEQP runner and gpu-trace-perf
+############### Build dEQP runner
 
 . .gitlab-ci/container/build-deqp-runner.sh
 
-############### Build gpu-trace-perf
-
-. .gitlab-ci/container/build-gpu-trace-perf.sh
-
 ############### Build apitrace
 
 . .gitlab-ci/container/build-apitrace.sh
 
 ############### Uninstall the build software
 
-section_switch debian_cleanup "Cleaning up base Debian system"
+uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system"
 
 apt-get purge -y "${EPHEMERAL[@]}"
 

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

@@ -7,7 +7,7 @@ set -e
 
 set -o xtrace
 
-section_start debian_setup "Base Debian system setup"
+uncollapsed_section_start debian_setup "Base Debian system setup"
 
 export DEBIAN_FRONTEND=noninteractive
 : "${LLVM_VERSION:?llvm version not set!}"
@@ -123,7 +123,7 @@ fi
 
 ############### Uninstall the build software
 
-section_switch debian_cleanup "Cleaning up base Debian system"
+uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system"
 
 apt-get purge -y "${EPHEMERAL[@]}"
 

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

@@ -9,7 +9,7 @@ set -e
 
 set -o xtrace
 
-section_start debian_setup "Base Debian system setup"
+uncollapsed_section_start debian_setup "Base Debian system setup"
 
 export DEBIAN_FRONTEND=noninteractive
 
@@ -47,7 +47,6 @@ EPHEMERAL=(
     python3-pip
     python3-setuptools
     python3-wheel
-    unzip
     xz-utils
 )
 
@@ -109,23 +108,18 @@ if [ "$DEBIAN_ARCH" != "armhf" ]; then
   . .gitlab-ci/container/build-gfxreconstruct.sh
 fi
 
-############### Build Wine
-
-# Wine isn't available on 32-bit ARM
-if [ "$DEBIAN_ARCH" != "armhf" ]; then
-  . .gitlab-ci/container/build-wine.sh
-fi
-
 ############### Build VKD3D-Proton
 
 # Wine isn't available on 32-bit ARM
 if [ "$DEBIAN_ARCH" != "armhf" ]; then
+  uncollapsed_section_switch proton "Installing Proton (Wine/D3DVK emulation)"
+  . .gitlab-ci/container/setup-wine.sh "/vkd3d-proton-wine64"
   . .gitlab-ci/container/build-vkd3d-proton.sh
 fi
 
 ############### Uninstall the build software
 
-section_switch debian_cleanup "Cleaning up base Debian system"
+uncollapsed_section_switch debian_cleanup "Cleaning up base Debian system"
 
 apt-get purge -y "${EPHEMERAL[@]}"
 

.gitlab-ci/container/debian/x86_64_build-base.sh

@@ -50,7 +50,7 @@ DEPS=(
     libepoxy-dev
     libexpat1-dev
     libflatbuffers-dev
-    libglfw3-dev
+    libgtk-3-dev
     "libllvm${LLVM_VERSION}"
     libpciaccess-dev
     libunwind-dev

.gitlab-ci/container/debian/x86_64_build.sh

@@ -35,7 +35,6 @@ DEPS=(
     libgbm-dev
     libglvnd-dev
     liblua5.3-dev
-    libpng-dev
     libxcb-dri2-0-dev
     libxcb-dri3-dev
     libxcb-glx0-dev
@@ -46,9 +45,6 @@ DEPS=(
     libxcb-xfixes0-dev
     libxcb1-dev
     libxml2-dev
-    libwayland-bin
-    libwayland-dev
-    libwayland-egl-backend-dev
     "llvm-${LLVM_VERSION}-dev"
     ocl-icd-opencl-dev
     python3-pip
@@ -56,7 +52,6 @@ DEPS=(
     spirv-tools
     strace
     time
-    wayland-protocols
     zstd
 )
 
@@ -81,6 +76,8 @@ tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
 cd $XORGMACROS_VERSION; ./configure; make install; cd ..
 rm -rf $XORGMACROS_VERSION
 
+. .gitlab-ci/container/build-wayland.sh
+
 . .gitlab-ci/container/build-shader-db.sh
 
 . .gitlab-ci/container/build-directx-headers.sh

.gitlab-ci/container/debian/x86_64_test-android.sh

@@ -1,7 +1,157 @@
 #!/usr/bin/env bash
+# The relative paths in this file only become valid at runtime.
+# shellcheck disable=SC1091
+#
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_TEST_ANDROID_TAG
 
-ANDROID_ARCH=x86_64 \
-BUILD_CONTAINER=true \
-TEST_CONTAINER=true \
+set -e
+
+. .gitlab-ci/setup-test-env.sh
+
+set -o xtrace
+
+section_start debian_setup "Base Debian system setup"
+
+export DEBIAN_FRONTEND=noninteractive
+
+# Ephemeral packages (installed for this script and removed again at the end)
+EPHEMERAL=(
+    build-essential:native
+    ccache
+    cmake
+    config-package-dev
+    debhelper-compat
+    dpkg-dev
+    ninja-build
+    unzip
+)
+
+DEPS=(
+    aapt
+    cuttlefish-base
+    cuttlefish-user
+    iproute2
+)
+apt-get install -y --no-remove --no-install-recommends \
+      "${DEPS[@]}" "${EPHEMERAL[@]}"
+
+############### Building ...
+
+. .gitlab-ci/container/container_pre_build.sh
+
+section_end debian_setup
+
+############### Downloading Android tools
+
+section_start android-tools "Downloading Android tools"
+
+mkdir /android-tools
+pushd /android-tools
+
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+  -o eglinfo "https://${S3_HOST}/${S3_ANDROID_BUCKET}/mesa/mesa/${DATA_STORAGE_PATH}/eglinfo-android-x86_64"
+chmod +x eglinfo
+
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+  -o vulkaninfo "https://${S3_HOST}/${S3_ANDROID_BUCKET}/mesa/mesa/${DATA_STORAGE_PATH}/vulkaninfo-android-x86_64"
+chmod +x vulkaninfo
+
+popd
+
+section_end android-tools
+
+############### Downloading NDK for native builds for the guest ...
+
+section_start android-ndk "Downloading Android NDK"
+
+# Fetch the NDK and extract just the toolchain we want.
+ndk="android-ndk-${ANDROID_NDK_VERSION}"
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+  -o "$ndk.zip" "https://dl.google.com/android/repository/$ndk-linux.zip"
+unzip -q -d / "$ndk.zip"
+rm "$ndk.zip"
+
+section_end android-ndk
+
+############### Build ANGLE
+
+ANGLE_TARGET=android \
 DEBIAN_ARCH=amd64 \
-. .gitlab-ci/container/debian/test-android.sh
+. .gitlab-ci/container/build-angle.sh
+
+############### Build dEQP runner
+
+export ANDROID_NDK_HOME=/$ndk
+export RUST_TARGET=x86_64-linux-android
+. .gitlab-ci/container/build-rust.sh test
+. .gitlab-ci/container/build-deqp-runner.sh
+
+# Properly uninstall rustup including cargo and init scripts on shells
+rustup self uninstall -y
+
+############### Build dEQP
+
+DEQP_API=tools \
+DEQP_TARGET="android" \
+EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
+. .gitlab-ci/container/build-deqp.sh
+
+DEQP_API=GLES \
+DEQP_TARGET="android" \
+EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_ANDROID_EXE_LOGCAT=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
+. .gitlab-ci/container/build-deqp.sh
+
+DEQP_API=VK \
+DEQP_TARGET="android" \
+EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_ANDROID_EXE_LOGCAT=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
+. .gitlab-ci/container/build-deqp.sh
+
+rm -rf /VK-GL-CTS
+
+############### Downloading Cuttlefish resources ...
+
+section_start cuttlefish "Downloading and setting up Cuttlefish"
+
+mkdir /cuttlefish
+pushd /cuttlefish
+
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+  -O "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/aosp_cf_x86_64_only_phone-img-${CUTTLEFISH_BUILD_NUMBER}.tar.zst"
+
+tar --zstd -xvf aosp_cf_x86_64_only_phone-img-"$CUTTLEFISH_BUILD_NUMBER".tar.zst
+rm aosp_cf_x86_64_only_phone-img-"$CUTTLEFISH_BUILD_NUMBER".tar.zst
+ls -lhS ./*
+
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+  -O "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${CUTTLEFISH_PROJECT_PATH}/aosp-${CUTTLEFISH_BUILD_VERSION_TAGS}.${CUTTLEFISH_BUILD_NUMBER}/cvd-host_package-x86_64.tar.zst"
+tar --zst -xvf cvd-host_package-x86_64.tar.zst
+rm cvd-host_package-x86_64.tar.zst
+
+popd
+
+addgroup --system kvm
+usermod -a -G kvm,cvdnetwork root
+
+section_end cuttlefish
+
+############### Downloading Android CTS
+
+. .gitlab-ci/container/build-android-cts.sh
+
+############### Uninstall the build software
+
+section_switch debian_cleanup "Cleaning up base Debian system"
+
+rm -rf "/${ndk:?}"
+
+apt-get purge -y "${EPHEMERAL[@]}"
+
+. .gitlab-ci/container/container_post_build.sh
+
+section_end debian_cleanup
+
+############### Remove unused packages
+
+. .gitlab-ci/container/strip-rootfs.sh

.gitlab-ci/container/fdo_cntr_export.sh

@@ -48,13 +48,10 @@ 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"
-    rm -rf "${mountpoint}/renderdoc-win64"
     rm -rf "${mountpoint}/vkd3d-proton-tests"
-    rm -rf "${mountpoint}/wineprefix"
+    rm -rf "${mountpoint}/vkd3d-proton-wine64"
 
     # Compress to zstd
     ZSTD_CLEVEL=10 tar -C "$mountpoint" -I zstd -cf "$2" .

.gitlab-ci/container/fedora/x86_64_build.sh

@@ -38,7 +38,6 @@ DEPS=(
     gettext
     glslang
     kernel-headers
-    libstdc++-static
     llvm-devel
     ninja-build
     "pkgconfig(LLVMSPIRVLib)"

.gitlab-ci/container/gitlab-ci-inc.yml

@@ -20,6 +20,8 @@
   extends:
     - .set-image
     - .incorporate-base-tag+templates-commit
+  variables:
+    MESA_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${FDO_DISTRIBUTION_TAG}"
 
 .container:
   stage: container
@@ -40,7 +42,7 @@
     FDO_DISTRIBUTION_EXEC: 'bash .gitlab-ci/container/container_job_trampoline.sh "${CI_JOB_NAME}"'
     # no need to pull the whole repo to build the container image
     GIT_STRATEGY: none
-    CI_BUILD_COMPONENTS: "$CI_BUILD_COMPONENTS_ANDROID_CTS $CI_BUILD_COMPONENTS_ANGLE $CI_BUILD_COMPONENTS_CROSVM $CI_BUILD_COMPONENTS_FLUSTER $CI_BUILD_COMPONENTS_PIGLIT $CI_BUILD_COMPONENTS_VKD3D_PROTON $CI_BUILD_COMPONENTS_WINE"
+    CI_BUILD_COMPONENTS: "$CI_BUILD_COMPONENTS_ANDROID_CTS $CI_BUILD_COMPONENTS_ANGLE $CI_BUILD_COMPONENTS_CROSVM $CI_BUILD_COMPONENTS_FLUSTER $CI_BUILD_COMPONENTS_PIGLIT $CI_BUILD_COMPONENTS_VKD3D_PROTON"
 
 .container-builds-angle:
   variables:
@@ -67,11 +69,6 @@
     VKD3D_PROTON_TAG: "${CONDITIONAL_BUILD_VKD3D_PROTON_TAG}"
     CI_BUILD_COMPONENTS_VKD3D_PROTON: vkd3d-proton
 
-.container-builds-wine:
-  variables:
-    WINE_TAG: "${CONDITIONAL_BUILD_WINE_TAG}"
-    CI_BUILD_COMPONENTS_WINE: wine
-
 .container-builds-android-cts:
   variables:
     ANDROID_CTS_TAG: "${CONDITIONAL_BUILD_ANDROID_CTS_TAG}"
@@ -103,7 +100,6 @@
   extends:
     - .container-builds-piglit
     - .container-builds-vkd3d-proton
-    - .container-builds-wine
 
 # Export the container rootfs and upload it to S3
 .export-container:

.gitlab-ci/container/install-wine-apitrace.sh

@@ -0,0 +1,16 @@
+#!/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"
+
+

.gitlab-ci/container/install-wine-dxvk.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+set -ue
+
+overrideDll() {
+  if ! wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$1" /d native /f; then
+    echo -e "Failed to add override for $1"
+    exit 1
+  fi
+}
+
+dxvk_install_release() {
+    local DXVK_VERSION=${1:?}
+
+    curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+	-O "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VERSION}/dxvk-${DXVK_VERSION}.tar.gz"
+    tar xzpf dxvk-"${DXVK_VERSION}".tar.gz
+    cp "dxvk-${DXVK_VERSION}"/x64/*.dll "$WINEPREFIX/drive_c/windows/system32/"
+    overrideDll d3d9
+    overrideDll d3d10core
+    overrideDll d3d11
+    overrideDll dxgi
+    rm -rf "dxvk-${DXVK_VERSION}"
+    rm dxvk-"${DXVK_VERSION}".tar.gz
+}
+
+dxvk_install_release "2.1"

.gitlab-ci/container/patches/build-deqp-Delay-SPIR-V-assembly-type-test-case-creation-to-ini.patch

@@ -1,527 +0,0 @@
-From e5840a8b8b2a4631a6a7ceab7099657298c9b14c Mon Sep 17 00:00:00 2001
-From: Ricardo Garcia <rgarcia@igalia.com>
-Date: Fri, 27 Mar 2026 12:22:16 +0100
-Subject: [PATCH] Delay SPIR-V assembly type test case creation to init method
-
-SPIR-V type tests have a simple problem: when creating a test group, the
-test group itself allocates a lot of data to be used as inputs and
-expected outputs for that subgroup of tests. This data is saved in a
-shared resource buffer inside test case nodes to avoid duplicating too
-much data between the different subcases that will use it, but it's
-still a lot.
-
-Untangling the buffer creation logic is quite challenging, because data
-generation happens in routines that mix that with SPIR-V assembly
-creation and other aspects, and depends on a wide variety of parameters,
-so deferring those allocations or the data generation routines to
-test instance creation time is very complex.
-
-The end result is that, before this commit, peak memory usage for
-deqp-vk when expanding the test hierarchy is 920MB, much of that coming
-from SPIR-V assembly type tests.
-
-Taking advantage of the fact that each test group does not contain a lot
-of tests and some of them share the same inputs, this commit applies a
-couple of simple tricks to delay test case creation until init() is
-called for each test group, without heavily refactoring the existing
-test creation code. The automatic call to deinit() when exiting test
-groups will delete the children nodes automatically, decreasing their
-lifetimes considerably.
-
-The result is that, instead of having all buffers allocated at the same
-time when exploring the SPIR-V type tests hierarchy, a small amount of
-them are allocated when expanding a small subgroup of tests, and
-deallocated before the next subgroup is created.
-
-With this change, peak memory usage goes down to around 380MB, from the
-initial 920MB.
-
-Memory has been measured with valgrind's massif tool. A before/after
-picture follows, in which the horizontal axis is "time" and the vertical
-axis is allocated memory.
-
-BEFORE:
-
-------------------------------------------------------------------------
-Command:            ./deqp-vk --deqp-runmode=txt-trie
-Massif arguments:   (none)
-ms_print arguments: massif.out.164123
-------------------------------------------------------------------------
-
-921.9 MB
-^                                #
-|                                #
-|                                #
-|                                #
-|                                #
-|                                #
-|                                #
-|                                #
-|                                #
-|                              @@#
-|                              @ #
-|                              @ #
-|                             @@ #
-|        @                    @@ #
-|        @                    @@ #
-|        @   :                @@ #                            :
-|       @@   ::      ::      :@@ #                            ::@
-|       @@  ::::::::::::: :: :@@ #  : ::                      ::@:::
-|     ::@@:::::::::::::::@::::@@ #::::: @:::::::@:::@:: ::    ::@::::
-|   :@::@@:::::::::::::::@::::@@ #: ::: @::: :::@:::@:::::@:  ::@:::::@:
-+---------------------------------------------------------------------->
-0                                                               481.1 Gi
-
-AFTER:
-
-------------------------------------------------------------------------
-Command:            ./deqp-vk --deqp-runmode=txt-trie
-Massif arguments:   (none)
-ms_print arguments: massif.out.656688
-------------------------------------------------------------------------
-
-379.7 MB
-^                             #
-|                             #
-|                             #
-|                             #
-|                             #
-|                             #
-|                             #
-|                             #
-|           ::                #                               :
-|           :         :       #                               ::
-|       @   : :       :      :#                               ::
-|       @   : :       :      :#                               ::::
-|       @   : ::: ::::::: :: :#                               :::
-|       @   : ::::: : ::  :  :#::: :::                        ::: :
-|       @:::: ::::: : :: :: ::#: ::: :::::: ::                ::: :::
-|      @@: :: ::::: : :: :: ::#: ::: :: : ::: @@::@: :  :     ::: ::
-|    ::@@: :: ::::: : :: :: ::#: ::: :: : ::: @ : @:::::::::  ::: :: @
-|   :: @@: :: ::::: : :: :: ::#: ::: :: : ::: @ : @:::: :::   ::: :: @:
-| :::: @@: :: ::::: : :: :: ::#: ::: :: : ::: @ : @:::: ::: : ::: :: @::
-| : :: @@: :: ::::: : :: :: ::#: ::: :: : ::: @ : @:::: ::: ::::: :: @::
-+---------------------------------------------------------------------->
-0                                                               484.3 Gi
-
-Affects:
-dEQP-VK.spirv_assembly.type.*
-
-Components: Vulkan
-VK-GL-CTS issue: 6420
-
-Change-Id: If2b83e26b7c1c0dc85dbd269d443bae2bd5138e1
-
-(cherry picked from commit efd184e1d58c6aff6b8e7812fa1cf23931b0b4d7,
-hacked by anholt to apply even without 1ff671975b48 ("Tests for
-VK_EXT_shader_long_vector")
----
- .../vktPipelineExtendedDynamicStateTests.cpp  |   1 +
- ...vktPipelineShaderModuleIdentifierTests.cpp |   1 +
- .../spirv_assembly/vktSpvAsmTypeTests.cpp     | 224 +++++++++++++++---
- .../vktSynchronizationSignalOrderTests.cpp    |   2 +
- ...tSynchronizationTimelineSemaphoreTests.cpp |   2 +
- .../vktTransformFeedbackSimpleTests.cpp       |   1 +
- .../modules/vulkan/vktTestGroupUtil.hpp       |   3 +
- 7 files changed, 207 insertions(+), 27 deletions(-)
-
-diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp
-index a2b1a4952700..257d2b1a9dcd 100644
---- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp
-+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp
-@@ -6953,6 +6953,7 @@ public:
-     void deinit(void) override
-     {
-         cleanupDevices();
-+        tcu::TestCaseGroup::deinit();
-     }
- };
- 
-diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineShaderModuleIdentifierTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineShaderModuleIdentifierTests.cpp
-index 3aec2a33c365..e47b039fa6cd 100644
---- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineShaderModuleIdentifierTests.cpp
-+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineShaderModuleIdentifierTests.cpp
-@@ -3729,6 +3729,7 @@ public:
-     void deinit(void) override
-     {
-         deviceHelperManage(nullptr, DeviceHelperOp::DELETE);
-+        tcu::TestCaseGroup::deinit();
-     }
- };
- 
-diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmTypeTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmTypeTests.cpp
-index f20ce2437b36..712b39a864d4 100644
---- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmTypeTests.cpp
-+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmTypeTests.cpp
-@@ -891,20 +891,171 @@ public:
-     SpvAsmTypeTests(tcu::TestContext &testCtx, const char *name, const char *deviceFeature, const char *spirvCapability,
-                     const char *spirvType, InputType inputType, uint32_t typeSize, uint32_t vectorSize);
-     ~SpvAsmTypeTests(void);
-+
-     void createTests(const char *testName, uint32_t spirvOperation, OpUnaryFuncType op, UnaryFilterFuncType filter,
-                      InputRange inputRange, InputWidth inputWidth, const char *spirvExtension,
--                     const bool returnHighPart = false);
-+                     const bool returnHighPart = false)
-+    {
-+        // Defer creation to ::init().
-+        m_unaryTestsParams.emplace_back(testName, spirvOperation, op, filter, inputRange, inputWidth, spirvExtension,
-+                                        returnHighPart);
-+    }
-+
-     void createTests(const char *testName, uint32_t spirvOperation, OpBinaryFuncType op, BinaryFilterFuncType filter,
-                      InputRange inputRange, InputWidth inputWidth, const char *spirvExtension,
--                     const bool returnHighPart = false);
-+                     const bool returnHighPart = false)
-+    {
-+        // Defer creation to ::init().
-+        m_binaryTestsParams.emplace_back(testName, spirvOperation, op, filter, inputRange, inputWidth, spirvExtension,
-+                                         returnHighPart);
-+    }
-+
-     void createTests(const char *testName, uint32_t spirvOperation, OpTernaryFuncType op, TernaryFilterFuncType filter,
-                      InputRange inputRange, InputWidth inputWidth, const char *spirvExtension,
--                     const bool returnHighPart = false);
-+                     const bool returnHighPart = false)
-+    {
-+        // Defer creation to ::init().
-+        m_ternaryTestsParams.emplace_back(testName, spirvOperation, op, filter, inputRange, inputWidth, spirvExtension,
-+                                          returnHighPart);
-+    }
-+
-     void createTests(const char *testName, uint32_t spirvOperation, OpQuaternaryFuncType op,
-                      QuaternaryFilterFuncType filter, InputRange inputRange, InputWidth inputWidth,
--                     const char *spirvExtension, const bool returnHighPart = false);
-+                     const char *spirvExtension, const bool returnHighPart = false)
-+    {
-+        // Defer creation to ::init().
-+        m_quaternaryTestsParams.emplace_back(testName, spirvOperation, op, filter, inputRange, inputWidth,
-+                                             spirvExtension, returnHighPart);
-+    }
-+
-+protected:
-+    struct UnaryTestsCreationParams
-+    {
-+        UnaryTestsCreationParams(const char *testName_, uint32_t spirvOperation_, OpUnaryFuncType op_,
-+                                 UnaryFilterFuncType filter_, InputRange inputRange_, InputWidth inputWidth_,
-+                                 const char *spirvExtension_, const bool returnHighPart_)
-+            : testName(testName_)
-+            , spirvOperation(spirvOperation_)
-+            , op(op_)
-+            , filter(filter_)
-+            , inputRange(inputRange_)
-+            , inputWidth(inputWidth_)
-+            , spirvExtension(spirvExtension_ ? spirvExtension_ : "")
-+            , returnHighPart(returnHighPart_)
-+        {
-+        }
-+
-+        std::string testName;
-+        uint32_t spirvOperation;
-+        OpUnaryFuncType op;
-+        UnaryFilterFuncType filter;
-+        InputRange inputRange;
-+        InputWidth inputWidth;
-+        std::string spirvExtension;
-+        bool returnHighPart;
-+    };
-+
-+    struct BinaryTestsCreationParams
-+    {
-+        BinaryTestsCreationParams(const char *testName_, uint32_t spirvOperation_, OpBinaryFuncType op_,
-+                                  BinaryFilterFuncType filter_, InputRange inputRange_, InputWidth inputWidth_,
-+                                  const char *spirvExtension_, const bool returnHighPart_)
-+            : testName(testName_)
-+            , spirvOperation(spirvOperation_)
-+            , op(op_)
-+            , filter(filter_)
-+            , inputRange(inputRange_)
-+            , inputWidth(inputWidth_)
-+            , spirvExtension(spirvExtension_ ? spirvExtension_ : "")
-+            , returnHighPart(returnHighPart_)
-+        {
-+        }
-+
-+        std::string testName;
-+        uint32_t spirvOperation;
-+        OpBinaryFuncType op;
-+        BinaryFilterFuncType filter;
-+        InputRange inputRange;
-+        InputWidth inputWidth;
-+        std::string spirvExtension;
-+        bool returnHighPart;
-+    };
-+
-+    struct TernaryTestsCreationParams
-+    {
-+        TernaryTestsCreationParams(const char *testName_, uint32_t spirvOperation_, OpTernaryFuncType op_,
-+                                   TernaryFilterFuncType filter_, InputRange inputRange_, InputWidth inputWidth_,
-+                                   const char *spirvExtension_, const bool returnHighPart_)
-+            : testName(testName_)
-+            , spirvOperation(spirvOperation_)
-+            , op(op_)
-+            , filter(filter_)
-+            , inputRange(inputRange_)
-+            , inputWidth(inputWidth_)
-+            , spirvExtension(spirvExtension_ ? spirvExtension_ : "")
-+            , returnHighPart(returnHighPart_)
-+        {
-+        }
-+
-+        std::string testName;
-+        uint32_t spirvOperation;
-+        OpTernaryFuncType op;
-+        TernaryFilterFuncType filter;
-+        InputRange inputRange;
-+        InputWidth inputWidth;
-+        std::string spirvExtension;
-+        bool returnHighPart;
-+    };
-+
-+    struct QuaternaryTestsCreationParams
-+    {
-+        QuaternaryTestsCreationParams(const char *testName_, uint32_t spirvOperation_, OpQuaternaryFuncType op_,
-+                                      QuaternaryFilterFuncType filter_, InputRange inputRange_, InputWidth inputWidth_,
-+                                      const char *spirvExtension_, const bool returnHighPart_)
-+            : testName(testName_)
-+            , spirvOperation(spirvOperation_)
-+            , op(op_)
-+            , filter(filter_)
-+            , inputRange(inputRange_)
-+            , inputWidth(inputWidth_)
-+            , spirvExtension(spirvExtension_ ? spirvExtension_ : "")
-+            , returnHighPart(returnHighPart_)
-+        {
-+        }
-+
-+        std::string testName;
-+        uint32_t spirvOperation;
-+        OpQuaternaryFuncType op;
-+        QuaternaryFilterFuncType filter;
-+        InputRange inputRange;
-+        InputWidth inputWidth;
-+        std::string spirvExtension;
-+        bool returnHighPart;
-+    };
-+
-+    std::vector<UnaryTestsCreationParams> m_unaryTestsParams;
-+    std::vector<BinaryTestsCreationParams> m_binaryTestsParams;
-+    std::vector<TernaryTestsCreationParams> m_ternaryTestsParams;
-+    std::vector<QuaternaryTestsCreationParams> m_quaternaryTestsParams;
-+
-+protected:
-+    void doCreateTests(const char *testName, uint32_t spirvOperation, OpUnaryFuncType op, UnaryFilterFuncType filter,
-+                       InputRange inputRange, InputWidth inputWidth, const char *spirvExtension,
-+                       const bool returnHighPart);
-+    void doCreateTests(const char *testName, uint32_t spirvOperation, OpBinaryFuncType op, BinaryFilterFuncType filter,
-+                       InputRange inputRange, InputWidth inputWidth, const char *spirvExtension,
-+                       const bool returnHighPart);
-+    void doCreateTests(const char *testName, uint32_t spirvOperation, OpTernaryFuncType op,
-+                       TernaryFilterFuncType filter, InputRange inputRange, InputWidth inputWidth,
-+                       const char *spirvExtension, const bool returnHighPart);
-+    void doCreateTests(const char *testName, uint32_t spirvOperation, OpQuaternaryFuncType op,
-+                       QuaternaryFilterFuncType filter, InputRange inputRange, InputWidth inputWidth,
-+                       const char *spirvExtension, const bool returnHighPart);
-+
-+public:
-     void createSwitchTests(void);
--    void getConstantDataset(vector<T> inputDataset, vector<T> &outputDataset, uint32_t spirvOperation);
-+
-+    void getConstantDataset(const vector<T> &inputDataset, vector<T> &outputDataset, uint32_t spirvOperation);
-     virtual void getDataset(vector<T> &input, uint32_t numElements)              = 0;
-     virtual void pushResource(vector<Resource> &resource, const vector<T> &data) = 0;
- 
-@@ -923,6 +1074,33 @@ public:
- 
-     static string replicate(const std::string &replicant, const uint32_t count);
- 
-+public:
-+    void init(void) override
-+    {
-+        for (const auto &params : m_unaryTestsParams)
-+            doCreateTests(params.testName.c_str(), params.spirvOperation, params.op, params.filter, params.inputRange,
-+                          params.inputWidth, (params.spirvExtension.empty() ? nullptr : params.spirvExtension.c_str()),
-+                          params.returnHighPart);
-+
-+        for (const auto &params : m_binaryTestsParams)
-+            doCreateTests(params.testName.c_str(), params.spirvOperation, params.op, params.filter, params.inputRange,
-+                          params.inputWidth, (params.spirvExtension.empty() ? nullptr : params.spirvExtension.c_str()),
-+                          params.returnHighPart);
-+
-+        for (const auto &params : m_ternaryTestsParams)
-+            doCreateTests(params.testName.c_str(), params.spirvOperation, params.op, params.filter, params.inputRange,
-+                          params.inputWidth, (params.spirvExtension.empty() ? nullptr : params.spirvExtension.c_str()),
-+                          params.returnHighPart);
-+
-+        for (const auto &params : m_quaternaryTestsParams)
-+            doCreateTests(params.testName.c_str(), params.spirvOperation, params.op, params.filter, params.inputRange,
-+                          params.inputWidth, (params.spirvExtension.empty() ? nullptr : params.spirvExtension.c_str()),
-+                          params.returnHighPart);
-+
-+        if (m_vectorSize == 1)
-+            createSwitchTests();
-+    }
-+
- protected:
-     de::Random m_rnd;
-     T m_cases[3];
-@@ -1916,9 +2094,9 @@ string getVariableStr(vector<T> &dataset, const char *spirvType, uint32_t spirvO
- }
- 
- template <class T>
--void SpvAsmTypeTests<T>::createTests(const char *testName, uint32_t spirvOperation, OpUnaryFuncType operation,
--                                     UnaryFilterFuncType filter, InputRange inputRange, InputWidth inputWidth,
--                                     const char *spirvExtension, const bool returnHighPart)
-+void SpvAsmTypeTests<T>::doCreateTests(const char *testName, uint32_t spirvOperation, OpUnaryFuncType operation,
-+                                       UnaryFilterFuncType filter, InputRange inputRange, InputWidth inputWidth,
-+                                       const char *spirvExtension, const bool returnHighPart)
- {
-     DE_ASSERT(!isBooleanResultTest(spirvOperation));
- 
-@@ -2029,9 +2207,9 @@ void SpvAsmTypeTests<T>::createTests(const char *testName, uint32_t spirvOperati
- }
- 
- template <class T>
--void SpvAsmTypeTests<T>::createTests(const char *testName, uint32_t spirvOperation, OpBinaryFuncType operation,
--                                     BinaryFilterFuncType filter, InputRange inputRange, InputWidth inputWidth,
--                                     const char *spirvExtension, const bool returnHighPart)
-+void SpvAsmTypeTests<T>::doCreateTests(const char *testName, uint32_t spirvOperation, OpBinaryFuncType operation,
-+                                       BinaryFilterFuncType filter, InputRange inputRange, InputWidth inputWidth,
-+                                       const char *spirvExtension, const bool returnHighPart)
- {
-     const bool isBoolean      = isBooleanResultTest(spirvOperation);
-     const string resultName   = (returnHighPart || isBoolean) ? "%op_result_pre" : "%op_result";
-@@ -2098,9 +2276,9 @@ void SpvAsmTypeTests<T>::createTests(const char *testName, uint32_t spirvOperati
- }
- 
- template <class T>
--void SpvAsmTypeTests<T>::createTests(const char *testName, uint32_t spirvOperation, OpTernaryFuncType operation,
--                                     TernaryFilterFuncType filter, InputRange inputRange, InputWidth inputWidth,
--                                     const char *spirvExtension, const bool returnHighPart)
-+void SpvAsmTypeTests<T>::doCreateTests(const char *testName, uint32_t spirvOperation, OpTernaryFuncType operation,
-+                                       TernaryFilterFuncType filter, InputRange inputRange, InputWidth inputWidth,
-+                                       const char *spirvExtension, const bool returnHighPart)
- {
-     DE_ASSERT(!isBooleanResultTest(spirvOperation));
- 
-@@ -2151,9 +2329,9 @@ void SpvAsmTypeTests<T>::createTests(const char *testName, uint32_t spirvOperati
- }
- 
- template <class T>
--void SpvAsmTypeTests<T>::createTests(const char *testName, uint32_t spirvOperation, OpQuaternaryFuncType operation,
--                                     QuaternaryFilterFuncType filter, InputRange inputRange, InputWidth inputWidth,
--                                     const char *spirvExtension, const bool returnHighPart)
-+void SpvAsmTypeTests<T>::doCreateTests(const char *testName, uint32_t spirvOperation, OpQuaternaryFuncType operation,
-+                                       QuaternaryFilterFuncType filter, InputRange inputRange, InputWidth inputWidth,
-+                                       const char *spirvExtension, const bool returnHighPart)
- {
-     DE_ASSERT(!spirvExtension);
-     DE_ASSERT(!isBooleanResultTest(spirvOperation));
-@@ -2451,7 +2629,8 @@ void SpvAsmTypeTests<T>::createSwitchTests(void)
- }
- 
- template <class T>
--void SpvAsmTypeTests<T>::getConstantDataset(vector<T> inputDataset, vector<T> &outputDataset, uint32_t spirvOperation)
-+void SpvAsmTypeTests<T>::getConstantDataset(const vector<T> &inputDataset, vector<T> &outputDataset,
-+                                            uint32_t spirvOperation)
- {
-     const uint32_t numElements = (uint32_t)inputDataset.size();
- 
-@@ -4123,15 +4302,6 @@ tcu::TestCaseGroup *createTypeTests(tcu::TestContext &testCtx)
-     MAKE_TEST_V_I_8136("spec_constant_composite_initializer", SpvOpSpecConstantComposite, constant, FILTER_NONE,
-                        RANGE_FULL, nullptr)
- 
--    int8Tests[0]->createSwitchTests();
--    int16Tests[0]->createSwitchTests();
--    int32Tests[0]->createSwitchTests();
--    int64Tests[0]->createSwitchTests();
--    uint8Tests[0]->createSwitchTests();
--    uint16Tests[0]->createSwitchTests();
--    uint32Tests[0]->createSwitchTests();
--    uint64Tests[0]->createSwitchTests();
--
-     typeScalarTests->addChild(int8Tests[0].release());
-     typeScalarTests->addChild(int16Tests[0].release());
-     typeScalarTests->addChild(int32Tests[0].release());
-diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSignalOrderTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSignalOrderTests.cpp
-index 28795fe3e3c9..677633135d06 100644
---- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSignalOrderTests.cpp
-+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSignalOrderTests.cpp
-@@ -1119,6 +1119,7 @@ public:
-     void deinit(void)
-     {
-         cleanupGroup();
-+        tcu::TestCaseGroup::deinit();
-     }
- 
- private:
-@@ -1637,6 +1638,7 @@ public:
-     void deinit(void)
-     {
-         cleanupGroup();
-+        tcu::TestCaseGroup::deinit();
-     }
- 
- private:
-diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationTimelineSemaphoreTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationTimelineSemaphoreTests.cpp
-index 31c87b39f8c3..c9c169dd856c 100644
---- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationTimelineSemaphoreTests.cpp
-+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationTimelineSemaphoreTests.cpp
-@@ -1894,6 +1894,7 @@ public:
-     void deinit(void)
-     {
-         cleanupGroup();
-+        tcu::TestCaseGroup::deinit();
-     }
- 
- private:
-@@ -2429,6 +2430,7 @@ public:
-     void deinit(void)
-     {
-         cleanupGroup();
-+        tcu::TestCaseGroup::deinit();
-     }
- 
- private:
-diff --git a/external/vulkancts/modules/vulkan/transform_feedback/vktTransformFeedbackSimpleTests.cpp b/external/vulkancts/modules/vulkan/transform_feedback/vktTransformFeedbackSimpleTests.cpp
-index be1ce0f6f6ed..726cdb872256 100644
---- a/external/vulkancts/modules/vulkan/transform_feedback/vktTransformFeedbackSimpleTests.cpp
-+++ b/external/vulkancts/modules/vulkan/transform_feedback/vktTransformFeedbackSimpleTests.cpp
-@@ -6793,6 +6793,7 @@ public:
-     void deinit(void) override
-     {
-         cleanupDevices();
-+        tcu::TestCaseGroup::deinit();
-     }
- };
- 
-diff --git a/external/vulkancts/modules/vulkan/vktTestGroupUtil.hpp b/external/vulkancts/modules/vulkan/vktTestGroupUtil.hpp
-index 06164076dd13..bfc3e4df08b2 100644
---- a/external/vulkancts/modules/vulkan/vktTestGroupUtil.hpp
-+++ b/external/vulkancts/modules/vulkan/vktTestGroupUtil.hpp
-@@ -56,6 +56,7 @@ public:
-     {
-         if (m_cleanupGroup)
-             m_cleanupGroup(this);
-+        tcu::TestCaseGroup::deinit();
-     }
- 
- private:
-@@ -87,6 +88,7 @@ public:
-     {
-         if (m_cleanupGroup)
-             m_cleanupGroup(this, m_arg0);
-+        tcu::TestCaseGroup::deinit();
-     }
- 
- private:
-@@ -120,6 +122,7 @@ public:
-     {
-         if (m_cleanupGroup)
-             m_cleanupGroup(this, m_arg0, m_arg1);
-+        tcu::TestCaseGroup::deinit();
-     }
- 
- private:
--- 
-2.51.0
-

.gitlab-ci/container/patches/build-deqp-android-Implement-headless-WSI-fallback-using-AImageR.patch

@@ -1,367 +0,0 @@
-From a801d75fcb16db89d2af67dd40040bc7c5f59df0 Mon Sep 17 00:00:00 2001
-From: Valentine Burley <valentine.burley@collabora.com>
-Date: Thu, 23 Apr 2026 11:03:14 +0200
-Subject: [PATCH] android: Implement headless WSI fallback using AImageReader
-
-When running dEQP as a native executable (DEQP_ANDROID_EXE) on Android,
-a system-provided NativeActivity window is typically unavailable. This
-prevents Vulkan and EGL WSI tests from running as they require a valid
-ANativeWindow.
-
-This patch:
-- Implements a headless fallback using the AImageReader NDK API to
-  create an off-screen ANativeWindow in tcuAndroidPlatform.cpp.
-- Implements an active "null compositor" via an AImageReader listener
-  that immediately drains and releases acquired images. This ensures the
-  producer never runs out of buffers, fixing intermittent timeouts in
-  tests that require active consumption (e.g. maintenance1 tests).
-- Uses AImageReader_acquireNextImageAsync and AImage_deleteAsync (API 26+)
-  to handle GPU sync fences.
-- Adds thread-safe teardown logic using an atomic flag and a non-blocking
-  mutex lock (std::try_to_lock) to prevent race conditions between the
-  main thread and the background listener callback.
-- Adds ImageReaderNativeWindow (EGL) and ImageReaderVulkanWindow (Vulkan)
-  to manage the AImageReader and ImageQueue lifecycle.
-- Extracts the AImageReader creation logic into a shared helper
-  acquireImageReaderWindow().
-- Links against mediandk in android.cmake to provide AImageReader
-  support for Android API levels >= 24.
-- Uses AImageReader_newWithUsage (API 26+) with explicit hardware buffer flags
-  (SAMPLED_IMAGE | COMPOSER_OVERLAY) to mimic SurfaceFlinger allocation
-  constraints.
-- On Android API levels < 24 (where AImageReader is unavailable), window
-  acquisition failure now consistently throws ResourceError instead of
-  NotSupportedError. This aligns the EGL path with the existing Vulkan
-  behavior and reverts EGL to the previous CTS behavior.
-
-This allows surface and swapchain tests to function correctly in headless
-environments for both EGL and Vulkan.
-
-Components: Android, EGL, Framework, Vulkan
-VK-GL-CTS issue: 6468
-Affects:
-dEQP-EGL.*
-dEQP-VK.wsi.android.*
-
-Change-Id: I462e617ae60e4dc3d9f0aeec11fd1628d0c6ff12
-Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
----
- external/openglcts/README.md                  |   7 +-
- .../platform/android/tcuAndroidPlatform.cpp   | 237 +++++++++++++++++-
- targets/android/android.cmake                 |   5 +
- 3 files changed, 242 insertions(+), 7 deletions(-)
-
-diff --git a/external/openglcts/README.md b/external/openglcts/README.md
-index 2eae316f58..24b270aee5 100644
---- a/external/openglcts/README.md
-+++ b/external/openglcts/README.md
-@@ -323,9 +323,10 @@ This is identical to the builds on other platforms and is better for iterative
- runs of headless tests as CTS can be invoked and the output can be checked from
- a single interactive terminal.
- 
--This build doesn't support WSI tests and shouldn't be used for conformance
--submissions, it also isn't recommended for longer running tests since Android
--will terminate this process as soon as the `adb shell` session ends which may
-+This build supports WSI tests via a headless AImageReader fallback for both EGL
-+and Vulkan (Android API 24+). However, it shouldn't be used for conformance
-+submissions. It also isn't recommended for longer running tests since Android
-+will terminate this process as soon as the `adb shell` session ends, which may
- happen due to an unintentional device disconnection.
- 
- 	cmake <path to openglcts> -GNinja -DCMAKE_BUILD_TYPE=Debug \
-diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
-index af56dabb83..45861c8aee 100644
---- a/framework/platform/android/tcuAndroidPlatform.cpp
-+++ b/framework/platform/android/tcuAndroidPlatform.cpp
-@@ -35,6 +35,15 @@
- 
- // Assume no call translation is needed
- #include <android/native_window.h>
-+#if DE_ANDROID_API >= 24
-+#include <media/NdkImageReader.h>
-+#include <media/NdkImage.h>
-+#include <mutex>
-+#include <atomic>
-+#endif
-+#if DE_ANDROID_API >= 26
-+#include <android/hardware_buffer.h>
-+#endif
- struct egl_native_pixmap_t;
- DE_STATIC_ASSERT(sizeof(eglw::EGLNativeDisplayType) == sizeof(void *));
- DE_STATIC_ASSERT(sizeof(eglw::EGLNativePixmapType) == sizeof(struct egl_native_pixmap_t *));
-@@ -136,6 +145,141 @@ private:
-     WindowRegistry &m_windowRegistry;
- };
- 
-+#if DE_ANDROID_API >= 24
-+struct ImageQueue
-+{
-+    std::mutex lock;
-+    std::atomic<bool> closing{false};
-+    AImageReader_ImageListener listener;
-+
-+    ImageQueue()
-+    {
-+        listener.context          = this;
-+        listener.onImageAvailable = onImageAvailable;
-+    }
-+
-+    ~ImageQueue()
-+    {
-+    }
-+
-+    static void onImageAvailable(void *context, AImageReader *reader)
-+    {
-+        ImageQueue *queue = reinterpret_cast<ImageQueue *>(context);
-+
-+        std::unique_lock<std::mutex> guard(queue->lock, std::try_to_lock);
-+        if (!guard.owns_lock() || queue->closing.load(std::memory_order_acquire))
-+            return;
-+
-+        AImage *image = nullptr;
-+
-+#if DE_ANDROID_API >= 26
-+        int fenceFd = -1;
-+        while (AImageReader_acquireNextImageAsync(reader, &image, &fenceFd) == AMEDIA_OK && image != nullptr)
-+        {
-+            AImage_deleteAsync(image, fenceFd);
-+        }
-+#else
-+        while (AImageReader_acquireNextImage(reader, &image) == AMEDIA_OK && image != nullptr)
-+        {
-+            AImage_delete(image);
-+        }
-+#endif
-+    }
-+};
-+
-+static ANativeWindow *acquireImageReaderWindow(int width, int height, int32_t format, AImageReader **outReader,
-+                                               ImageQueue **outQueue)
-+{
-+    AImageReader *reader = nullptr;
-+#if DE_ANDROID_API >= 26
-+    uint64_t usage        = AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE | AHARDWAREBUFFER_USAGE_COMPOSER_OVERLAY;
-+    media_status_t status = AImageReader_newWithUsage(width, height, format, usage, 4, &reader);
-+#else
-+    media_status_t status = AImageReader_new(width, height, format, 4, &reader);
-+#endif
-+    if (status != AMEDIA_OK || !reader)
-+        throw ResourceError("Failed to create AImageReader", nullptr, __FILE__, __LINE__);
-+
-+    *outQueue = new ImageQueue();
-+    AImageReader_setImageListener(reader, &(*outQueue)->listener);
-+
-+    ANativeWindow *nativeWindow = nullptr;
-+    status                      = AImageReader_getWindow(reader, &nativeWindow);
-+    if (status != AMEDIA_OK || !nativeWindow)
-+    {
-+        AImageReader_setImageListener(reader, nullptr);
-+        delete *outQueue;
-+        *outQueue = nullptr;
-+        AImageReader_delete(reader);
-+        throw ResourceError("Failed to get window from AImageReader", nullptr, __FILE__, __LINE__);
-+    }
-+
-+    *outReader = reader;
-+    return nativeWindow;
-+}
-+
-+class ImageReaderNativeWindow : public eglu::NativeWindow
-+{
-+public:
-+    ImageReaderNativeWindow(AImageReader *reader, ImageQueue *queue, ANativeWindow *window, int width, int height)
-+        : eglu::NativeWindow(WINDOW_CAPABILITIES)
-+        , m_reader(reader)
-+        , m_queue(queue)
-+        , m_window(window)
-+        , m_size(width, height)
-+    {
-+    }
-+
-+    virtual ~ImageReaderNativeWindow(void)
-+    {
-+        if (m_reader)
-+        {
-+            if (m_queue)
-+            {
-+                m_queue->closing.store(true, std::memory_order_release);
-+                std::lock_guard<std::mutex> guard(m_queue->lock);
-+                AImageReader_setImageListener(m_reader, nullptr);
-+            }
-+            AImageReader_delete(m_reader);
-+        }
-+        if (m_queue)
-+            delete m_queue;
-+    }
-+
-+    virtual eglw::EGLNativeWindowType getLegacyNative(void)
-+    {
-+        return m_window;
-+    }
-+    virtual void *getPlatformExtension(void)
-+    {
-+        return m_window;
-+    }
-+    virtual void *getPlatformNative(void)
-+    {
-+        return m_window;
-+    }
-+    tcu::IVec2 getScreenSize(void) const
-+    {
-+        return m_size;
-+    }
-+    void setSurfaceSize(tcu::IVec2 size)
-+    {
-+        int32_t format = 0; // 0 means keep the existing format
-+        ANativeWindow_setBuffersGeometry(m_window, size.x(), size.y(), format);
-+        m_size = size;
-+    }
-+    virtual void processEvents(void)
-+    {
-+    }
-+
-+private:
-+    AImageReader *m_reader;
-+    ImageQueue *m_queue;
-+    ANativeWindow *m_window;
-+    tcu::IVec2 m_size;
-+};
-+#endif
-+
- // NativeWindow
- 
- NativeWindow::NativeWindow(Window *window, int width, int height, int32_t format)
-@@ -197,10 +341,30 @@ eglu::NativeWindow *NativeWindowFactory::createWindow(const eglu::WindowParams &
- {
-     Window *window = m_windowRegistry.tryAcquireWindow();
- 
--    if (!window)
--        throw NotSupportedError("Native window is not available", nullptr, __FILE__, __LINE__);
--
--    return new NativeWindow(window, params.width, params.height, format);
-+    if (window)
-+    {
-+        return new NativeWindow(window, params.width, params.height, format);
-+    }
-+    else
-+    {
-+#if DE_ANDROID_API >= 24
-+        int width  = params.width != eglu::WindowParams::SIZE_DONT_CARE ? params.width : 256;
-+        int height = params.height != eglu::WindowParams::SIZE_DONT_CARE ? params.height : 256;
-+        width      = width > 0 ? width : 256;
-+        height     = height > 0 ? height : 256;
-+
-+        AImageReader *reader = nullptr;
-+        ImageQueue *queue    = nullptr;
-+        // Always use AIMAGE_FORMAT_RGBA_8888: the AImageReader is only used as a
-+        // surface handle provider, and AIMAGE_FORMAT_* constants are not
-+        // interchangeable with ANativeWindow_LegacyFormat values.
-+        ANativeWindow *nativeWindow = acquireImageReaderWindow(width, height, AIMAGE_FORMAT_RGBA_8888, &reader, &queue);
-+
-+        return new ImageReaderNativeWindow(reader, queue, nativeWindow, width, height);
-+#else
-+        throw ResourceError("Native window is not available", nullptr, __FILE__, __LINE__);
-+#endif
-+    }
- }
- 
- // NativeDisplayFactory
-@@ -279,6 +443,55 @@ private:
-     tcu::Android::Window &m_window;
- };
- 
-+#if DE_ANDROID_API >= 24
-+class ImageReaderVulkanWindow : public vk::wsi::AndroidWindowInterface
-+{
-+public:
-+    ImageReaderVulkanWindow(AImageReader *reader, ImageQueue *queue, ANativeWindow *window)
-+        : vk::wsi::AndroidWindowInterface(vk::pt::AndroidNativeWindowPtr(window))
-+        , m_reader(reader)
-+        , m_queue(queue)
-+    {
-+    }
-+
-+    void setVisible(bool visible)
-+    {
-+        DE_UNREF(visible);
-+    }
-+
-+    void resize(const UVec2 &newSize)
-+    {
-+        DE_UNREF(newSize);
-+    }
-+
-+    void setMinimized(bool minimized)
-+    {
-+        DE_UNREF(minimized);
-+        TCU_THROW(NotSupportedError, "Minimized on Android is not implemented");
-+    }
-+
-+    ~ImageReaderVulkanWindow(void)
-+    {
-+        if (m_reader)
-+        {
-+            if (m_queue)
-+            {
-+                m_queue->closing.store(true, std::memory_order_release);
-+                std::lock_guard<std::mutex> guard(m_queue->lock);
-+                AImageReader_setImageListener(m_reader, nullptr);
-+            }
-+            AImageReader_delete(m_reader);
-+        }
-+        if (m_queue)
-+            delete m_queue;
-+    }
-+
-+private:
-+    AImageReader *m_reader;
-+    ImageQueue *m_queue;
-+};
-+#endif
-+
- class VulkanDisplay : public vk::wsi::Display
- {
- public:
-@@ -306,7 +519,23 @@ public:
-             }
-         }
-         else
-+        {
-+#if DE_ANDROID_API >= 24
-+            uint32_t width  = initialSize ? initialSize->x() : 256;
-+            uint32_t height = initialSize ? initialSize->y() : 256;
-+            width           = width > 0 ? width : 256;
-+            height          = height > 0 ? height : 256;
-+
-+            AImageReader *reader = nullptr;
-+            ImageQueue *queue    = nullptr;
-+            ANativeWindow *nativeWindow =
-+                acquireImageReaderWindow(width, height, AIMAGE_FORMAT_RGBA_8888, &reader, &queue);
-+
-+            return new ImageReaderVulkanWindow(reader, queue, nativeWindow);
-+#else
-             TCU_THROW(ResourceError, "Native window is not available");
-+#endif
-+        }
-     }
- 
- private:
-diff --git a/targets/android/android.cmake b/targets/android/android.cmake
-index 33843fcc09..6da33d3c17 100644
---- a/targets/android/android.cmake
-+++ b/targets/android/android.cmake
-@@ -64,6 +64,11 @@ if (DE_ANDROID_API GREATER 8)
- 	set(DEQP_PLATFORM_LIBRARIES ${DEQP_PLATFORM_LIBRARIES} ${ANDROID_LIBRARY})
- endif ()
- 
-+if (DE_ANDROID_API GREATER 23)
-+	find_library(MEDIANDK_LIBRARY NAMES mediandk PATHS /usr/lib)
-+	set(DEQP_PLATFORM_LIBRARIES ${DEQP_PLATFORM_LIBRARIES} ${MEDIANDK_LIBRARY})
-+endif ()
-+
- # Android uses customized execserver
- include_directories(execserver)
- set(DEQP_PLATFORM_LIBRARIES xscore ${DEQP_PLATFORM_LIBRARIES})
--- 
-2.51.0
-

.gitlab-ci/container/patches/build-deqp-gl_Build-Don-t-build-Vulkan-utilities-for-GL-builds.patch

@@ -1,4 +1,4 @@
-From 7d13c48a3d9d679d499f91e066e36340e72255bf Mon Sep 17 00:00:00 2001
+From ccdc2b9341c703507cba6017d2a494595335ffdc Mon Sep 17 00:00:00 2001
 From: Daniel Stone <daniels@collabora.com>
 Date: Wed, 29 Jan 2025 12:50:33 +0000
 Subject: [PATCH] Build: Don't build Vulkan utilities for GL builds
@@ -6,15 +6,15 @@ Subject: [PATCH] Build: Don't build Vulkan utilities for GL builds
 Change-Id: Ie412f914bb6264ffbd502deea57d80cc11a9948e
 Signed-off-by: Daniel Stone <daniels@collabora.com>
 ---
- framework/platform/CMakeLists.txt             |   9 -
- .../platform/android/tcuAndroidPlatform.cpp   | 191 +-----------------
+ framework/platform/CMakeLists.txt             |   9 --
+ .../platform/android/tcuAndroidPlatform.cpp   | 126 +-----------------
  .../platform/android/tcuAndroidPlatform.hpp   |  14 +-
  framework/platform/lnx/tcuLnxPlatform.cpp     |   9 +-
- .../surfaceless/tcuSurfacelessPlatform.cpp    |  52 -----
- 5 files changed, 3 insertions(+), 272 deletions(-)
+ .../surfaceless/tcuSurfacelessPlatform.cpp    |  54 --------
+ 5 files changed, 3 insertions(+), 209 deletions(-)
 
 diff --git a/framework/platform/CMakeLists.txt b/framework/platform/CMakeLists.txt
-index 8f6e0c5847..a675b815a9 100644
+index ec1deb5c2..49fe412a7 100644
 --- a/framework/platform/CMakeLists.txt
 +++ b/framework/platform/CMakeLists.txt
 @@ -15,8 +15,6 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS)
@@ -35,7 +35,7 @@ index 8f6e0c5847..a675b815a9 100644
  		)
  
  		include_directories(lnx)
-@@ -170,8 +166,6 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS)
+@@ -164,8 +160,6 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS)
  		set(TCUTIL_PLATFORM_SRCS
  			osx/tcuOSXPlatform.cpp
  			osx/tcuOSXPlatform.hpp
@@ -44,7 +44,7 @@ index 8f6e0c5847..a675b815a9 100644
  			osx/tcuOSXMetalView.mm
  			osx/tcuOSXMetalView.hpp
  			)
-@@ -197,9 +191,6 @@ if (DEQP_USE_WAYLAND)
+@@ -191,9 +185,6 @@ if (DEQP_USE_WAYLAND)
  	add_dependencies(tcutil-platform deqp-xdg-shell)
  endif()
  
@@ -55,7 +55,7 @@ index 8f6e0c5847..a675b815a9 100644
  
  # Always link to glutil as some platforms such as Win32 always support GL
 diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
-index 45861c8aee..c1054656ed 100644
+index af56dabb8..6b0de6dba 100644
 --- a/framework/platform/android/tcuAndroidPlatform.cpp
 +++ b/framework/platform/android/tcuAndroidPlatform.cpp
 @@ -31,7 +31,6 @@
@@ -66,7 +66,7 @@ index 45861c8aee..c1054656ed 100644
  
  // Assume no call translation is needed
  #include <android/native_window.h>
-@@ -381,167 +380,6 @@ eglu::NativeDisplay *NativeDisplayFactory::createDisplay(const EGLAttrib *attrib
+@@ -217,102 +216,6 @@ eglu::NativeDisplay *NativeDisplayFactory::createDisplay(const EGLAttrib *attrib
      return new NativeDisplay();
  }
  
@@ -132,55 +132,6 @@ index 45861c8aee..c1054656ed 100644
 -    tcu::Android::Window &m_window;
 -};
 -
--#if DE_ANDROID_API >= 24
--class ImageReaderVulkanWindow : public vk::wsi::AndroidWindowInterface
--{
--public:
--    ImageReaderVulkanWindow(AImageReader *reader, ImageQueue *queue, ANativeWindow *window)
--        : vk::wsi::AndroidWindowInterface(vk::pt::AndroidNativeWindowPtr(window))
--        , m_reader(reader)
--        , m_queue(queue)
--    {
--    }
--
--    void setVisible(bool visible)
--    {
--        DE_UNREF(visible);
--    }
--
--    void resize(const UVec2 &newSize)
--    {
--        DE_UNREF(newSize);
--    }
--
--    void setMinimized(bool minimized)
--    {
--        DE_UNREF(minimized);
--        TCU_THROW(NotSupportedError, "Minimized on Android is not implemented");
--    }
--
--    ~ImageReaderVulkanWindow(void)
--    {
--        if (m_reader)
--        {
--            if (m_queue)
--            {
--                m_queue->closing.store(true, std::memory_order_release);
--                std::lock_guard<std::mutex> guard(m_queue->lock);
--                AImageReader_setImageListener(m_reader, nullptr);
--            }
--            AImageReader_delete(m_reader);
--        }
--        if (m_queue)
--            delete m_queue;
--    }
--
--private:
--    AImageReader *m_reader;
--    ImageQueue *m_queue;
--};
--#endif
--
 -class VulkanDisplay : public vk::wsi::Display
 -{
 -public:
@@ -208,23 +159,7 @@ index 45861c8aee..c1054656ed 100644
 -            }
 -        }
 -        else
--        {
--#if DE_ANDROID_API >= 24
--            uint32_t width  = initialSize ? initialSize->x() : 256;
--            uint32_t height = initialSize ? initialSize->y() : 256;
--            width           = width > 0 ? width : 256;
--            height          = height > 0 ? height : 256;
--
--            AImageReader *reader = nullptr;
--            ImageQueue *queue    = nullptr;
--            ANativeWindow *nativeWindow =
--                acquireImageReaderWindow(width, height, AIMAGE_FORMAT_RGBA_8888, &reader, &queue);
--
--            return new ImageReaderVulkanWindow(reader, queue, nativeWindow);
--#else
 -            TCU_THROW(ResourceError, "Native window is not available");
--#endif
--        }
 -    }
 -
 -private:
@@ -234,7 +169,7 @@ index 45861c8aee..c1054656ed 100644
  static size_t getTotalSystemMemory(ANativeActivity *activity)
  {
      const size_t MiB = (size_t)(1 << 20);
-@@ -570,8 +408,7 @@ static size_t getTotalSystemMemory(ANativeActivity *activity)
+@@ -341,8 +244,7 @@ static size_t getTotalSystemMemory(ANativeActivity *activity)
  // Platform
  
  Platform::Platform(NativeActivity &activity)
@@ -244,7 +179,7 @@ index 45861c8aee..c1054656ed 100644
  {
      m_nativeDisplayFactoryRegistry.registerFactory(new NativeDisplayFactory(m_windowRegistry));
      m_contextFactoryRegistry.registerFactory(new eglu::GLContextFactory(m_nativeDisplayFactoryRegistry));
-@@ -587,16 +424,6 @@ bool Platform::processEvents(void)
+@@ -358,16 +260,6 @@ bool Platform::processEvents(void)
      return true;
  }
  
@@ -261,7 +196,7 @@ index 45861c8aee..c1054656ed 100644
  void Platform::getMemoryLimits(tcu::PlatformMemoryLimits &limits) const
  {
      // Worst-case estimates
-@@ -630,22 +457,6 @@ void Platform::getMemoryLimits(tcu::PlatformMemoryLimits &limits) const
+@@ -401,22 +293,6 @@ void Platform::getMemoryLimits(tcu::PlatformMemoryLimits &limits) const
      limits.devicePageTableHierarchyLevels    = 3;
  }
  
@@ -285,7 +220,7 @@ index 45861c8aee..c1054656ed 100644
  } // namespace tcu
  
 diff --git a/framework/platform/android/tcuAndroidPlatform.hpp b/framework/platform/android/tcuAndroidPlatform.hpp
-index 32cc9068c4..3c3f02d98d 100644
+index 32cc9068c..3c3f02d98 100644
 --- a/framework/platform/android/tcuAndroidPlatform.hpp
 +++ b/framework/platform/android/tcuAndroidPlatform.hpp
 @@ -27,7 +27,6 @@
@@ -332,7 +267,7 @@ index 32cc9068c4..3c3f02d98d 100644
      const size_t m_totalSystemMemory;
  };
 diff --git a/framework/platform/lnx/tcuLnxPlatform.cpp b/framework/platform/lnx/tcuLnxPlatform.cpp
-index 8c0a3ef06e..6b1a4985a1 100644
+index 8c0a3ef06..6b1a4985a 100644
 --- a/framework/platform/lnx/tcuLnxPlatform.cpp
 +++ b/framework/platform/lnx/tcuLnxPlatform.cpp
 @@ -23,12 +23,10 @@
@@ -374,7 +309,7 @@ index 8c0a3ef06e..6b1a4985a1 100644
  #if defined(DEQP_SUPPORT_GLX)
      m_glPlatform.registerFactory(x11::glx::createContextFactory(m_eventState));
 diff --git a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
-index 2224f4164e..713c4ee9e2 100644
+index 585bfbbae..9f386b3ca 100644
 --- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
 +++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
 @@ -43,7 +43,6 @@
@@ -438,7 +373,7 @@ index 2224f4164e..713c4ee9e2 100644
  bool isEGLExtensionSupported(const eglw::Library &egl, eglw::EGLDisplay, const std::string &extName)
  {
      const vector<string> exts = eglu::getClientExtensions(egl);
-@@ -191,13 +144,8 @@ public:
+@@ -191,13 +144,6 @@ public:
      {
          return *this;
      }
@@ -446,12 +381,12 @@ index 2224f4164e..713c4ee9e2 100644
 -    {
 -        return m_vkPlatform;
 -    }
- 
- private:
+-
+-private:
 -    VulkanPlatform m_vkPlatform;
  };
  
  class ContextFactory : public glu::ContextFactory
 -- 
-2.51.0
+2.45.2
 

.gitlab-ci/container/setup-wine.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -u
+
+uncollapsed_section_start wine "Setting up Wine"
+
+export WINEPREFIX="$1"
+export WINEDEBUG="-all"
+
+# We don't want crash dialogs
+cat >crashdialog.reg <<EOF
+Windows Registry Editor Version 5.00
+
+[HKEY_CURRENT_USER\Software\Wine\WineDbg]
+"ShowCrashDialog"=dword:00000000
+
+EOF
+
+# Set the wine prefix and disable the crash dialog
+wine regedit crashdialog.reg
+rm crashdialog.reg
+
+# An immediate wine command may fail with: "${WINEPREFIX}: Not a
+# valid wine prefix."  and that is just spit because of checking
+# the existance of the system.reg file, which fails.  Just giving
+# it a bit more of time for it to be created solves the problem
+# ...
+while ! test -f  "${WINEPREFIX}/system.reg"; do sleep 1; done
+
+section_end wine

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

@@ -47,7 +47,6 @@ UNNEEDED_PACKAGES=(
   libgl1-mesa-dri mesa-vulkan-drivers mesa-va-drivers mesa-vdpau-drivers i965-va-driver
   intel-media-va-driver
   gnupg2
-  qemu-user
 )
 
 # Removing unneeded packages
@@ -113,6 +112,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
   /usr/local/bin/mold
   /usr/local/bin/bindgen
   /usr/local/bin/cargo*

.gitlab-ci/crosvm-runner.sh

@@ -150,17 +150,15 @@ crosvm --no-syslog run \
 section_start crosvm_results "Processing crosvm results"
 CROSVM_RET=$?
 
-[ "${CROSVM_RET}" -eq 0 ] && {
+[ ${CROSVM_RET} -eq 0 ] && {
     # The actual return code is the crosvm guest script's exit code
     CROSVM_RET=$(cat ${VM_TEMP_DIR}/exit_code 2>/dev/null)
-    # Sanitize it to a single integer
-    CROSVM_RET=$(echo "$CROSVM_RET" | grep -o '^[0-9]\+' | head -n 1)
     # Force error when the guest script's exit code is not available
     CROSVM_RET=${CROSVM_RET:-1}
 }
 
 # Show crosvm output on error to help with debugging
-[ "${CROSVM_RET}" -eq 0 ] || {
+[ ${CROSVM_RET} -eq 0 ] || {
     { set +x; } 2>/dev/null
     echo "Dumping crosvm output.." >&2
     cat ${VM_TEMP_DIR}/crosvm >&2

.gitlab-ci/cuttlefish-runner.sh

@@ -58,7 +58,7 @@ ulimit -n 32768
 VSOCK_BASE=10000 # greater than all the default vsock ports
 VSOCK_CID=$((VSOCK_BASE + (CI_JOB_ID & 0xfff)))
 
-HOME=/cuttlefish timeout 5m launch_cvd \
+HOME=/cuttlefish launch_cvd \
   -daemon \
   -verbosity=INFO \
   -file_verbosity=VERBOSE \
@@ -67,7 +67,6 @@ HOME=/cuttlefish timeout 5m launch_cvd \
   -enable_bootanimation=false \
   -enable_minimal_mode=true \
   -enable_modem_simulator=false \
-  -enable_wifi=false \
   -guest_enforce_security=false \
   -report_anonymous_usage_stats=no \
   -gpu_mode="$CUTTLEFISH_GPU_MODE" \

.gitlab-ci/deqp-runner.sh

@@ -49,12 +49,6 @@ elif [ -d "/piglit" ]; then
   rm -r /piglit
 fi
 
-if [ -n "$VKD3D_PROTON_TAG" ]; then
-  # Are we using the right vkd3d-proton version?
-  ci_tag_test_time_check "VKD3D_PROTON_TAG"
-fi
-
-
 # Ensure Mesa Shader Cache resides on tmpfs.
 SHADER_CACHE_HOME=${XDG_CACHE_HOME:-${HOME}/.cache}
 SHADER_CACHE_DIR=${MESA_SHADER_CACHE_DIR:-${SHADER_CACHE_HOME}/mesa_shader_cache}
@@ -64,13 +58,11 @@ findmnt -n tmpfs ${SHADER_CACHE_HOME} || findmnt -n tmpfs ${SHADER_CACHE_DIR} ||
     mount -t tmpfs -o nosuid,nodev,size=2G,mode=1755 tmpfs ${SHADER_CACHE_DIR}
 }
 
-FILE_ARGS=""
-
 touch /fails.txt
+touch /flakes.txt
+cat $INSTALL/all-skips.txt > /skips.txt
 
-# There must be a single baseline expected fails list, this lets us cat together
-# xfails from multiple possible sources. Do we actually use this, though?
-cat_if_exists() {
+add_if_exists() {
   prefix=$1
   kind=$2
   if [ -e "$INSTALL/$prefix-$kind.txt" ]; then
@@ -78,31 +70,22 @@ cat_if_exists() {
   fi
 }
 
-add_if_exists() {
-  if [ -e "$INSTALL/$2" ]; then
-    FILE_ARGS="$FILE_ARGS $1 $INSTALL/$2"
-  fi
-}
-
 # remove duplicate values to avoid reading the same file multiple times
-for prefix in $({
-  echo "all"
+{
   echo "$DRIVER_NAME"
   echo "$GPU_VERSION"
-} | sort -u); do
-  cat_if_exists "$prefix" fails
-  add_if_exists "--flakes" "$prefix-flakes.txt"
-  add_if_exists "--skips" "$prefix-skips.txt"
-  add_if_exists "--single-thread" "$prefix-single-thread.txt"
+} | sort -u | while read -r prefix; do
+  add_if_exists "$prefix" fails
+  add_if_exists "$prefix" flakes
+  add_if_exists "$prefix" skips
 done
 
-if [[ $CI_JOB_NAME != *full* ]]; then
-  FILE_ARGS="$FILE_ARGS --skips $INSTALL/all-slow-skips.txt"
-  add_if_exists "--skips" "$GPU_VERSION-slow-skips.txt"
+if [ -e "$INSTALL/$GPU_VERSION-slow-skips.txt" ] && [[ $CI_JOB_NAME != *full* ]]; then
+    cat "$INSTALL/$GPU_VERSION-slow-skips.txt" >> /skips.txt
 fi
 
 if [ -n "${ANGLE_TAG:-}" ]; then
-    FILE_ARGS="$FILE_ARGS --skips $INSTALL/angle-skips.txt"
+    cat "$INSTALL/angle-skips.txt" >> /skips.txt
 fi
 
 # Set the path to VK validation layer settings (in case it ends up getting loaded)
@@ -154,14 +137,15 @@ deqp-runner \
     --suite $INSTALL/deqp-$DEQP_SUITE.toml \
     --output $RESULTS_DIR \
     --baseline /fails.txt \
-    $FILE_ARGS \
+    --skips /skips.txt \
+    --flakes /flakes.txt \
     --testlog-to-xml /deqp-tools/testlog-to-xml \
     --fraction-start ${CI_NODE_INDEX:-1} \
     --fraction $((CI_NODE_TOTAL * ${DEQP_FRACTION:-1})) \
     --jobs ${FDO_CI_CONCURRENT:-4} \
     ${DEQP_RUNNER_MAX_FAILS:+--max-fails "$DEQP_RUNNER_MAX_FAILS"} \
     ${DEQP_RUNNER_SHADER_CACHE_DIR:+--shader-cache-dir "$DEQP_RUNNER_SHADER_CACHE_DIR"} \
-    ${DEQP_FORCE_ASAN:+--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so --env ASAN_OPTIONS=malloc_fill_byte=1}; DEQP_EXITCODE=$?
+    ${DEQP_FORCE_ASAN:+--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so}; DEQP_EXITCODE=$?
 
 { set +x; } 2>/dev/null
 
@@ -172,23 +156,12 @@ set -x
 
 report_load
 
-# Remove all but the first 50 individual XML, test log and caselist
-# files uploaded as artifacts, to save fd.o space and avoid job log spam
-# when you break everything.
-# Note that each of these pattern gets to keep 50 files, but there is nothing
-# making sure the remaining 50 files of each correspond to the same tests.
+# Remove all but the first 50 individual XML files uploaded as artifacts, to
+# save fd.o space when you break everything.
 find $RESULTS_DIR -name \*.xml | \
     sort -n |
     sed -n '1,+49!p' | \
     xargs rm -f
-find $RESULTS_DIR -name 'c*.r*.caselist.txt' | \
-    sort -n |
-    sed -n '1,+49!p' | \
-    xargs rm -f
-find $RESULTS_DIR -name 'c*.r*.log' | \
-    sort -n |
-    sed -n '1,+49!p' | \
-    xargs rm -f
 
 # If any QPA XMLs are there, then include the XSL/CSS in our artifacts.
 find $RESULTS_DIR -name \*.xml \

.gitlab-ci/farm-rules.yml

@@ -43,7 +43,7 @@
 #   pengutronix      | lava                             | @hnez, @lynxeye
 #   valve-kws        | ci-tron                          | @mupuf, @eric
 #   valve-mupuf      | ci-tron                          | @mupuf, @eric
-#   vmware           | lava                             | @mombasa, @bhenden
+#   vmware           | lava                             | @blu
 
 .microsoft-farm-rules:
   rules:
@@ -336,66 +336,67 @@
 
 # Skip container & build jobs when disabling any farm, and run them if any
 # farm gets re-enabled.
-# Just like above, don't apply these rules in scheduled pipelines (see comment
-# on line 23).
-.disable-farm-rules:
+# Only apply these rules in MR context, because otherwise we get a false
+# positive on files being 'created' when pushing to a new branch, and break
+# our pipeline
+.disable-farm-mr-rules:
   rules:
     # changes(disabled) + exists(disabled) = disabling the farm
     # Note: this cannot be simplified into a single `.ci-farms-disabled/*` rule
     # because if there are more than one disabled farm and we only re-enable
     # one, the exits(.ci-farms-disabled/*) would match and what should be
     # a farm re-enable pipeline will be detected as a farm disable pipeline.
-    - changes: [ .ci-farms-disabled/microsoft ]
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes: [ .ci-farms-disabled/microsoft ]
       exists: [ .ci-farms-disabled/microsoft ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
       when: never
-    - changes: [ .ci-farms-disabled/collabora ]
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes: [ .ci-farms-disabled/collabora ]
       exists: [ .ci-farms-disabled/collabora ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
       when: never
-    - changes: [ .ci-farms-disabled/igalia ]
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes: [ .ci-farms-disabled/igalia ]
       exists: [ .ci-farms-disabled/igalia ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
       when: never
-    - changes: [ .ci-farms-disabled/lima ]
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes: [ .ci-farms-disabled/lima ]
       exists: [ .ci-farms-disabled/lima ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
       when: never
-    - changes: [ .ci-farms-disabled/anholt ]
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes: [ .ci-farms-disabled/anholt ]
       exists: [ .ci-farms-disabled/anholt ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
       when: never
-    - changes: [ .ci-farms-disabled/valve-mupuf ]
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes: [ .ci-farms-disabled/valve-mupuf ]
       exists: [ .ci-farms-disabled/valve-mupuf ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
       when: never
-    - changes: [ .ci-farms-disabled/valve-kws ]
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes: [ .ci-farms-disabled/valve-kws ]
       exists: [ .ci-farms-disabled/valve-kws ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
       when: never
-    - changes: [ .ci-farms-disabled/austriancoder ]
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes: [ .ci-farms-disabled/austriancoder ]
       exists: [ .ci-farms-disabled/austriancoder ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
       when: never
-    - changes: [ .ci-farms-disabled/ondracka ]
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes: [ .ci-farms-disabled/ondracka ]
       exists: [ .ci-farms-disabled/ondracka ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
       when: never
-    - changes: [ .ci-farms-disabled/vmware ]
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes: [ .ci-farms-disabled/vmware ]
       exists: [ .ci-farms-disabled/vmware ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
       when: never
-    - changes: [ .ci-farms-disabled/pengutronix ]
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes: [ .ci-farms-disabled/pengutronix ]
       exists: [ .ci-farms-disabled/pengutronix ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
       when: never
-    - changes: [ .ci-farms-disabled/lumag ]
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes: [ .ci-farms-disabled/lumag ]
       exists: [ .ci-farms-disabled/lumag ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
       when: never
-    - changes: [ .ci-farms-disabled/imagination ]
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes: [ .ci-farms-disabled/imagination ]
       exists: [ .ci-farms-disabled/imagination ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
       when: never
     # Any other change to ci-farms/* means some farm is getting re-enabled.
     # Run jobs in Marge pipelines (and let it fallback to manual otherwise)

.gitlab-ci/gpu-trace-replay.sh

@@ -1,152 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-# shellcheck disable=SC1091 # paths only become valid at runtime
-
-. "${SCRIPTS_DIR}/setup-test-env.sh"
-
-section_start traces_prepare "traces: preparing test setup"
-
-set -ex
-
-# Our rootfs may not have "less", which apitrace uses during apitrace dump
-export PAGER=cat  # FIXME: export everywhere
-
-INSTALL=$(realpath -s "$PWD"/install)
-
-if [ -n "${LAVA_HTTP_CACHE_URI:-}" ]; then
-  export EXTRA_ARGS="${EXTRA_ARGS} --download-caching-proxy=${LAVA_HTTP_CACHE_URI}"
-elif [ -n "${CI_TRON_JOB_HTTP_SERVER:-}" ]; then
-  # The caching proxy doesn't appear to be working.
-  # export EXTRA_ARGS="${EXTRA_ARGS} --download-caching-proxy=${CI_TRON_JOB_HTTP_SERVER}/caching_proxy/"
-  true
-elif [ -n "${FDO_HTTP_CACHE_URI:-}" ]; then
-  # FIXME: remove when there is no baremetal traces job anymore.
-  export EXTRA_ARGS="${EXTRA_ARGS} --download-caching-proxy=${FDO_HTTP_CACHE_URI}"
-fi
-
-if [ $GITLAB_USER_LOGIN == "marge-bot" ]; then
-    # When merging the MR, uploading to the permanent storage for .pngs must
-    # succeed.
-    export EXTRA_ARGS="${EXTRA_ARGS} --snapshot-url-must-work"
-fi
-
-# Set up the environment.
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/"
-if [ -n "${VK_DRIVER}" ]; then
-  ARCH=$(uname -m)
-  export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
-  export VK_ADD_LAYER_PATH="$INSTALL/share/vulkan/explicit_layer.d"
-fi
-
-MESA_VERSION=$(head -1 "$INSTALL/VERSION" | sed 's/\./\\./g')
-
-# Set environment for replay tool executables.
-export PATH="/apitrace/build:/gfxreconstruct/build/bin:$PATH"
-
-echo "Version:"
-apitrace version 2>/dev/null || echo "apitrace not found (Linux)"
-
-if [ "$GALLIUM_DRIVER" = "virpipe" ]; then
-    # replay is to use virpipe, and virgl_test_server llvmpipe
-    export GALLIUM_DRIVER="$GALLIUM_DRIVER"
-
-    GALLIUM_DRIVER=llvmpipe \
-    VTEST_USE_EGL_SURFACELESS=1 \
-    VTEST_USE_GLES=1 \
-    virgl_test_server >"$RESULTS_DIR"/vtest-log.txt 2>&1 &
-
-    sleep 1
-fi
-
-cd $RESULTS_DIR && rm -rf ..?* .[!.]* ./*
-
-if [ -n "$WINE_TAG" ]; then
-  # Are we using the right wine version?
-  ci_tag_test_time_check "WINE_TAG"
-
-  # Set environment for Wine.
-  export WINEDEBUG="-all"
-  export WINEPREFIX="/wineprefix"
-  export WINEESYNC=1
-  export WINEPATH="/apitrace-msvc-win64/bin;/renderdoc-win64"
-
-  # This may be useful if you're debugging DXVK loading.
-  #export WINEDEBUG="+loaddll,+module"
-fi
-
-# Disable using fast-linked GPL shaders in DXVK.  Otherwise, we may end up with
-# (subtly, hopefully) flaky rendering when the optimized pipeline gets swapped
-# in.
-export DXVK_CONFIG="dxvk.enableGraphicsPipelineLibrary=False"
-
-# ANGLE: download compiled ANGLE runtime and the compiled restricted traces
-# (all-in-one package).
-if [ -n "$ANGLE_TRACE_FILES_TAG" ]; then
-  ANGLE_DIR="${INSTALL}/traces-db/angle"
-  mkdir -p "${ANGLE_DIR}"
-
-  if [ "$(uname -m)" = "aarch64" ]; then
-    ANGLE_ARCH=arm64
-  else
-    ANGLE_ARCH=x64
-  fi
-
-  FILE="angle-bin-${ANGLE_ARCH}-${ANGLE_TRACE_FILES_TAG}.tar.zst"
-  curl --location --fail --retry-all-errors --retry 4 --retry-delay 60 \
-    --header "Authorization: Bearer $(cat "${S3_JWT_FILE}")" \
-    "https://s3.freedesktop.org/mesa-tracie-private/${FILE}" --output "${FILE}"
-  tar --zstd -xf ${FILE} -C "${ANGLE_DIR}"
-  rm ${FILE}
-
-  EXTRA_ARGS="${EXTRA_ARGS} --traces-db ${INSTALL}/traces-db"
-fi
-
-# Sanity check to ensure that our environment is sufficient to make our tests
-# run against the Mesa built by CI, rather than any installed distro version.
-if [ -z "${VK_DRIVER}" ]; then
-  wflinfo -a gles2 -p wayland | tee /tmp/version.txt | grep "Mesa $MESA_VERSION\(\s\|$\)"
-else
-  vulkaninfo | grep driverInfo | tee /tmp/version.txt | grep "Mesa $MESA_VERSION\(\s\|$\)"
-fi
-
-uncollapsed_section_switch traces "traces: run traces"
-
-# This gets lost in uncollapsed_section_switch.
-set -x
-
-# wrapper to supress +x to avoid spamming the log
-quiet() {
-    set +x
-    "$@"
-    set -x
-}
-
-report_failure() {
-    echo "Review the image changes and get a checksums patch at: ${ARTIFACTS_BASE_URL}/results/index.html"
-    echo "If the new traces look correct to you, you can update the checksums"
-    echo "locally by running:"
-    echo "    ./bin/ci/update_traces_checksum.sh"
-    echo "and resubmit this merge request."
-    exit 1
-}
-report_success() {
-    echo "All image checksums matched.  Results can be viewed at ${ARTIFACTS_BASE_URL}/results/index.html"
-}
-
-if gpu-trace-perf replay \
-  -j ${FDO_CI_CONCURRENT:-4} \
-  --fraction-start ${CI_NODE_INDEX:-1} \
-  --fraction ${CI_NODE_TOTAL} \
-  --output $RESULTS_DIR \
-  --cache-dir $CACHE_DIR \
-  --config $INSTALL/$REPLAY_CONFIG \
-  --device $GPU_VERSION \
-  --jwt "${S3_JWT_FILE}" \
-  --snapshots-url "https://$PIGLIT_REPLAY_REFERENCE_IMAGES_BASE/" \
-  --job-url "https://$JOB_ARTIFACTS_BASE/" \
-  $EXTRA_ARGS \
-  ; then
-    quiet report_success
-else
-    quiet report_failure
-fi

.gitlab-ci/image-tags.yml

@@ -19,27 +19,27 @@ include:
   - .gitlab-ci/conditional-build-image-tags.yml
 
 variables:
-  DEBIAN_BUILD_BASE_TAG: "20260529-rust-1.85"
-  DEBIAN_BUILD_TAG: "20260504-screenshot"
+  DEBIAN_BUILD_BASE_TAG: "20251016-riscv"
+  DEBIAN_BUILD_TAG: "20260106-android16"
 
-  DEBIAN_TEST_BASE_TAG: "20260529-rust-1.85"
-  DEBIAN_TEST_ANDROID_TAG: "20260602-angle-19"
-  DEBIAN_TEST_GL_TAG: "20260609-vvl-2a"
-  DEBIAN_TEST_VIDEO_TAG: "20260512-vkuprev"
-  DEBIAN_TEST_VK_TAG: "20260604-vkd3d"
+  DEBIAN_TEST_BASE_TAG: "20260113-deqp-runner"
+  DEBIAN_TEST_ANDROID_TAG: "20260119-glcts"
+  DEBIAN_TEST_GL_TAG: "20260119-glcts"
+  DEBIAN_TEST_VIDEO_TAG: "20250813-vector"
+  DEBIAN_TEST_VK_TAG: "20260114-vkcts"
 
-  ALPINE_X86_64_BUILD_TAG: "20260429-libdrm"
+  ALPINE_X86_64_BUILD_TAG: "20251001-realninja"
 
-  FEDORA_X86_64_BUILD_TAG: "20260429-staticcpp"
+  FEDORA_X86_64_BUILD_TAG: "20250917-rust"
 
-  KERNEL_TAG: "v6.19-mesa-712d"
+  KERNEL_TAG: "v6.17-mesa-ceea"
   KERNEL_REPO: "gfx-ci/linux"
-  PKG_REPO_REV: "69788eae"
-  FIRMWARE_TAG: "ff46ce35"
+  PKG_REPO_REV: "0d2527f6"
+  FIRMWARE_TAG: "8fc31b97"
   FIRMWARE_REPO: "gfx-ci/firmware"
 
   WINDOWS_X64_MSVC_TAG: "20251120-bison"
 
-  WINDOWS_X64_BUILD_TAG: "20260309-D3D619"
+  WINDOWS_X64_BUILD_TAG: "20251120-bison"
 
-  WINDOWS_X64_TEST_TAG: "20260309-D3D619"
+  WINDOWS_X64_TEST_TAG: "20251120-bison"

.gitlab-ci/lava/gitlab-ci.yml

@@ -13,7 +13,7 @@ variables:
   # 4. lava/health-check-docker - the slim container used for fastboot
   # Set image: directly instead of extending .set-image to avoid conflicts
   # with MESA_IMAGE_PATH and FDO_DISTRIBUTION_TAG between the containers.
-  image: registry.freedesktop.org/gfx-ci/lava-job-submitter/alpine/x86_64_lava-trigger:20260302.0
+  image: registry.freedesktop.org/gfx-ci/lava-job-submitter/alpine/x86_64_lava-trigger:20251111.0
   # Cancel job if a newer commit is pushed to the same branch
   interruptible: true
   # The jobs themselves shouldn't actually run for an hour, of course.
@@ -187,24 +187,6 @@ variables:
     KERNEL_IMAGE_TYPE: "image"
     BOOT_METHOD: u-boot
 
-.lava-arm64-test-android:
-  extends:
-    - .use-debian/arm64_test-android
-    - .lava-arm64-test
-    - .android-variables
-  variables:
-    HWCI_KERNEL_MODULES: vhost_vsock
-    HWCI_TEST_SCRIPT: install/cuttlefish-runner.sh
-    S3_ANDROID_ARTIFACT_NAME: mesa-arm64-android-debug
-  needs:
-    - job: debian/arm64_test-android
-      artifacts: false
-      optional: true
-    - job: debian-arm64  # The generic Linux build for the host will be downloaded later
-      artifacts: false
-    - job: debian-android  # The Android build for the guest will be downloaded later and installed via adb
-      artifacts: false
-
 .lava-arm64-test-gl:
   extends:
     - .use-debian/arm64_test-gl

.gitlab-ci/lava/lava-submit.sh

@@ -41,14 +41,6 @@ fdo_log_section_end variables
 
 fdo_log_section_start_collapsed lava_submit "Submitting job for scheduling"
 
-# GitLab jobs use a default 1-hour timeout, which can allow jobs to run longer than intended.
-# CI_JOB_TIMEOUT (GitLab timeout in seconds) is used here to set the LAVA job timeout.
-# For Marge, we override this to 25 minutes (with 5 minutes subtracted below for lava-job-submitter),
-# giving a still conservative, but safer timeout to avoid jobs running for too long.
-if [ $GITLAB_USER_LOGIN == "marge-bot" ]; then
-	export CI_JOB_TIMEOUT=1500
-fi
-
 touch results/lava.log
 tail -f results/lava.log &
 # Ensure that we are printing the commands that are being executed,
@@ -56,8 +48,6 @@ tail -f results/lava.log &
 set -x
 
 # List of optional overlays
-# NOTE: If you encounter "Attempted path traversal in tar file at /dev/ttyS1",
-# that is an indication that one of your rootfs and overlays contain a duplicate file.
 LAVA_EXTRA_OVERLAYS=()
 if [ -n "${LAVA_FIRMWARE:-}" ]; then
     for fw in $LAVA_FIRMWARE; do
@@ -83,7 +73,7 @@ if [ -n "${ANDROID_CTS_TAG:-}" ]; then
 	LAVA_EXTRA_OVERLAYS+=(
 		- append-overlay
 		  --name=android-cts
-		  --url="$(fdo_find_s3_path "${DATA_STORAGE_PATH}/android-cts/${DEBIAN_ARCH}/${ANDROID_CTS_TAG}.tar.zst")"
+		  --url="$(fdo_find_s3_path "${DATA_STORAGE_PATH}/android-cts/${ANDROID_CTS_TAG}.tar.zst")"
 		  --path="/"
 		  --format=tar
 		  --compression=zstd
@@ -92,7 +82,7 @@ fi
 if [ -n "${FLUSTER_TAG:-}" ]; then
 	LAVA_EXTRA_OVERLAYS+=(
 		- append-overlay
-		  --name=fluster
+		  --name=vkd3d-proton
 		  --url="$(fdo_find_s3_path "${DATA_STORAGE_PATH}/fluster/${FLUSTER_TAG}/vectors.tar.zst")"
 		  --path="/"
 		  --format=tar
@@ -109,16 +99,6 @@ if [ -n "${VKD3D_PROTON_TAG:-}" ]; then
 		  --compression=zstd
 	)
 fi
-if [ -n "${WINE_TAG:-}" ]; then
-	LAVA_EXTRA_OVERLAYS+=(
-		- append-overlay
-		  --name=wine
-		  --url="$(fdo_find_s3_path "${DATA_STORAGE_PATH}/wine/${DEBIAN_TEST_VK_TAG}-${WINE_TAG}/${MESA_IMAGE_PATH}/wine.tar.zst")"
-		  --path="/"
-		  --format=tar
-		  --compression=zstd
-	)
-fi
 if [ -n "${S3_ANDROID_ARTIFACT_NAME:-}" ]; then
 	LAVA_EXTRA_OVERLAYS+=(
 		- append-overlay

.gitlab-ci/meson/build.sh

@@ -175,7 +175,6 @@ meson_subprojects=(
   thiserror-impl-2-rs
   ucd-trie-0.1-rs
   unicode-ident-1-rs
-  xml-rs
   zerocopy-derive-0.8-rs
   ${FORCE_FALLBACK_FOR:-}
 )

.gitlab-ci/meson/time-strace.sh

@@ -2,7 +2,7 @@
 # shellcheck disable=SC2086 # we want word splitting
 
 if [[ -z "$STRACEDIR" ]]; then
-    STRACEDIR=meson-logs/strace/$(for i in "$@"; do basename -z -- $i; echo -n _; done |  head -c100).$$
+    STRACEDIR=meson-logs/strace/$(for i in "$@"; do basename -z -- $i; echo -n _; done).$$
 fi
 
 mkdir -p $STRACEDIR

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

@@ -135,9 +135,7 @@ replay_s3_upload_images() {
 
 SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD | tee /tmp/version.txt | grep \"Mesa $MESA_VERSION\(\s\|$\)\""
 
-if [ "${GIT_STRATEGY:-}" = none ]; then
-  cd $RESULTS_DIR && rm -rf ..?* .[!.]* *
-fi
+cd $RESULTS_DIR && rm -rf ..?* .[!.]* *
 cd /piglit
 
 if [ -n "$USE_CASELIST" ]; then
@@ -167,6 +165,16 @@ RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $SANITY_MESA_VERSION_CMD &&
 # run.
 rm -rf replayer-db
 
+# ANGLE: download compiled ANGLE runtime and the compiled restricted traces (all-in-one package)
+if [ -n "$PIGLIT_REPLAY_ANGLE_ARCH" ]; then
+  FILE="angle-bin-${PIGLIT_REPLAY_ANGLE_ARCH}-${ANGLE_TRACE_FILES_TAG}.tar.zst"
+  curl --location --fail --retry-all-errors --retry 4 --retry-delay 60 \
+    --header "Authorization: Bearer $(cat "${S3_JWT_FILE}")" \
+    "https://s3.freedesktop.org/mesa-tracie-private/${FILE}" --output "${FILE}"
+  mkdir -p replayer-db/angle
+  tar --zstd -xf ${FILE} -C replayer-db/angle/
+fi
+
 PIGLIT_RESULTS="${PIGLIT_RESULTS:-replay}"
 RESULTSFILE="$RESULTS_DIR/$PIGLIT_RESULTS.txt"
 mkdir -p .gitlab-ci/piglit

.gitlab-ci/prepare-artifacts.sh

@@ -46,7 +46,6 @@ for f in \
   .gitlab-ci/piglit \
   .gitlab-ci/fossils.yml \
   .gitlab-ci/fossils \
-  .gitlab-ci/gpu-trace-replay.sh \
   .gitlab-ci/crosvm-init.sh \
   .gitlab-ci/*.txt \
   .gitlab-ci/report-flakes.py \

.gitlab-ci/run-shader-db.sh

@@ -23,7 +23,7 @@ for driver in freedreno lima v3d vc4; do
 done
 
 # Run shader-db over a number of supported platforms for crocus/iris
-for platform in hsw bdw skl mtl lnl ptl; do
+for platform in hsw bdw skl mtl; do
     section_start "shader-db-intel-${platform}" "Running shader-db for intel - ${platform}"
     env LD_PRELOAD="$LIBDIR/libintel_noop_drm_shim.so" \
         INTEL_STUB_GPU_PLATFORM="${platform}" \

.gitlab-ci/setup-test-env.sh

@@ -41,13 +41,9 @@ export JOB_START_S=$(
   { date -u +"%s" -D "%Y-%m-%dT%H:%M:%SZ" "$CI_JOB_STARTED_AT" 2>/dev/null || true; }
 )
 
-function get_job_seconds {
-    DATE_S=$(date -u +"%s")
-    echo $((DATE_S-JOB_START_S))
-}
-
 function get_current_minsec {
-    CURR_TIME=$(get_job_seconds)
+    DATE_S=$(date -u +"%s")
+    CURR_TIME=$((DATE_S-JOB_START_S))
     printf "%02d:%02d" $((CURR_TIME/60)) $((CURR_TIME%60))
 }
 
@@ -130,11 +126,11 @@ export -f _error_msg
 
 if [ -z "${RESULTS_DIR:-}" ]; then
 	export RESULTS_DIR="${PWD%/}/results"
-	if [ "${GIT_STRATEGY:-}" = none ]; then
+	if [ -e "${RESULTS_DIR}" ]; then
 		rm -rf "${RESULTS_DIR}"
 	fi
+	mkdir -p "${RESULTS_DIR}"
 fi
-mkdir -p "${RESULTS_DIR}"
 
 function error {
     # we force the following to be not in a section

.gitlab-ci/test/gitlab-ci-inc.yml

@@ -120,31 +120,6 @@
     VKD3D_PROTON_TAG: ${CONDITIONAL_BUILD_VKD3D_PROTON_TAG}
     HWCI_TEST_SCRIPT: install/vkd3d-runner.sh
 
-.test-wine:
-  variables:
-    WINE_TAG: ${CONDITIONAL_BUILD_WINE_TAG}
-
-.traces-test:
-  artifacts:
-    # We don't specify on:failure, because it's useful for devs to be able to go
-    # look at the actual rendering results of other drivers.
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
-    paths:
-      - results/
-  variables:
-    CACHE_DIR: $CI_PROJECT_DIR/traces-db/
-    HWCI_TEST_SCRIPT: "install/gpu-trace-replay.sh"
-    # For downloading traces:
-    CI_TRON_HTTP_ARTIFACT__TRACIE_PUBLIC__PATH: /caching_proxy/https://s3.freedesktop.org/mesa-tracie-public/(.*)
-    CI_TRON_HTTP_ARTIFACT__TRACIE_PUBLIC__URL: https://s3.freedesktop.org/mesa-tracie-public/\1
-    CI_TRON_HTTP_ARTIFACT__TRACIE_PRIVATE__PATH: /caching_proxy/https://s3.freedesktop.org/mesa-tracie-private/(.*)
-    CI_TRON_HTTP_ARTIFACT__TRACIE_PRIVATE__URL: https://s3.freedesktop.org/mesa-tracie-private/\1
-    # For uploading renders:
-    # s3.fd.o redirects to hetzner, so we need that too
-    CI_TRON_PROXY__ALLOWED_ENDPOINTS_CATEGORY__S3__FDO: s3.freedesktop.org:443
-    CI_TRON_PROXY__ALLOWED_ENDPOINTS_CATEGORY__S3__BACKEND: fsn1.your-objectstorage.com:443
-
-
 .piglit-traces-test:
   artifacts:
     when: on_failure
@@ -174,7 +149,7 @@
 
 .deqp-test:
   script:
-    - if [ "${GIT_STRATEGY:-}" = none ]; then rm -rf results; fi  # Clear out old results if the docker container was cached
+    - rm -rf results  # Clear out old results if the docker container was cached
     - ./install/deqp-runner.sh
   artifacts:
     exclude:
@@ -200,6 +175,6 @@
     # setup).
     - section_start artifacts_download "Downloading artifacts from s3"
     # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
-    - if [ "${GIT_STRATEGY:-}" = none ]; then rm -rf install; fi
+    - rm -rf install
     - (set -x; curl -L --retry 4 -f --retry-all-errors --retry-delay 60 ${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME}.tar.zst | tar --zstd -x)
     - section_end artifacts_download

.gitlab-ci/test/gitlab-ci.yml

@@ -61,6 +61,9 @@ shader-db:
     paths:
       - shader-db
   timeout: 15m
+  tags:
+    # FIXME: kvm is a hack, should not be needed
+    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64_KVM
 
 yaml-toml-shell-py-test:
   extends:
@@ -78,6 +81,7 @@ yaml-toml-shell-py-test:
     - section_end shellcheck
     - .gitlab-ci/run-pytest.sh
   rules:
+    - !reference [.disable-farm-mr-rules, rules]
     - !reference [.never-post-merge-rules, rules]
     - !reference [.no_scheduled_pipelines-rules, rules]
     # merge pipeline

.gitlab-ci/vkd3d-runner.sh

@@ -29,13 +29,18 @@ INSTALL=$(realpath -s "$PWD"/install)
 # 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/"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:$INSTALL/lib/:/vkd3d-proton-tests/lib/"
 
 
 # Set the Vulkan driver to use.
 ARCH=$(uname -m)
 export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.$ARCH.json"
 
+# Set environment for Wine.
+export WINEDEBUG="-all"
+export WINEPREFIX="/vkd3d-proton-wine64"
+export WINEESYNC=1
+
 if [ -f "$INSTALL/$GPU_VERSION-vkd3d-skips.txt" ]; then
   mapfile -t skips < <(grep -vE '^#|^$' "$INSTALL/$GPU_VERSION-vkd3d-skips.txt")
   VKD3D_TEST_EXCLUDE=$(comma_separated "${skips[@]}")
@@ -46,21 +51,11 @@ fi
 # Sanity check to ensure that our environment is sufficient to make our tests
 # run against the Mesa built by CI, rather than any installed distro version.
 MESA_VERSION=$(cat "$INSTALL/VERSION")
-
-if [ "${VKD3D_FORCE_ASAN:-0}" -eq 1 ]; then
-    export LD_PRELOAD="libasan.so.8:$INSTALL/lib/libdlclose-skip.so"
-    export ASAN_OPTIONS="malloc_fill_byte=1"
-fi
-
 if ! vulkaninfo | grep driverInfo | tee /tmp/version.txt | grep -qF "Mesa $MESA_VERSION"; then
     printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION"
     exit 1
 fi
 
-if [ "${VKD3D_FORCE_ASAN:-0}" -eq 1 ]; then
-    unset LD_PRELOAD
-fi
-
 # Gather the list expected failures
 EXPECTATIONFILE="$RESULTS_DIR/$GPU_VERSION-vkd3d-fails.txt"
 if [ -f "$INSTALL/$GPU_VERSION-vkd3d-fails.txt" ]; then
@@ -104,15 +99,10 @@ fi
 
 printf "%s\n" "Running vkd3d-proton testsuite..."
 
-if [ "${VKD3D_FORCE_ASAN:-0}" -eq 1 ]; then
-    export LD_PRELOAD="libasan.so.8:$INSTALL/lib/libdlclose-skip.so"
-    export LD_LIBRARY_PATH="/vkd3d-proton-tests/libs/d3d12:/vkd3d-proton-tests/libs/d3d12core:${LD_LIBRARY_PATH}"
-fi
-
 LOGFILE="$RESULTS_DIR/vkd3d-proton-log.txt"
 TEST_LOGS="/test-logs"
 pushd /vkd3d-proton-tests
-tests/test-runner.sh tests/d3d12 --jobs "${FDO_CI_CONCURRENT:-4}" --output-dir "$TEST_LOGS" | tee "$LOGFILE" || true
+tests/test-runner.sh ./d3d12 --jobs "${FDO_CI_CONCURRENT:-4}" --output-dir "$TEST_LOGS" | tee "$LOGFILE" || true
 popd
 
 printf '\n\n'

.gitlab-ci/windows/mesa_deps_build.ps1

@@ -12,7 +12,7 @@ $depsInstallPath="C:\mesa-deps"
 
 Get-Date
 Write-Host "Cloning DirectX-Headers"
-git clone -b v1.619.1 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
+git clone -b v1.618.1 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
 if (!$?) {
   Write-Host "Failed to clone DirectX-Headers repository"
   Exit 1

.gitlab-ci/windows/mesa_deps_d3d.ps1

@@ -8,7 +8,7 @@ $depsInstallPath="C:\mesa-deps"
 
 Write-Host "Downloading DirectX 12 Agility SDK at:"
 Get-Date
-Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.619.1 -OutFile 'agility.zip'
+Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.618.1 -OutFile 'agility.zip'
 Expand-Archive -Path 'agility.zip' -DestinationPath 'C:\agility'
 # Copy Agility SDK into mesa-deps\bin\D3D12
 New-Item -ErrorAction SilentlyContinue -ItemType Directory -Path $depsInstallPath\bin -Name 'D3D12'

.gitlab/issue_templates/Bug Report - AMD Radeon Vulkan.md

@@ -72,4 +72,4 @@ Consider recording a [GFXReconstruct](https://github.com/LunarG/gfxreconstruct/b
 
 Does the issue reproduce with the LLVM backend (`RADV_DEBUG=llvm`) or on the AMDGPU-PRO drivers?
 
-Does your environment set any of the variables `ACO_DEBUG`, `RADV_DEBUG`, `RADV_PERFTEST` and `RADV_EXPERIMENTAL`?
+Does your environment set any of the variables `ACO_DEBUG`, `RADV_DEBUG`, and `RADV_PERFTEST`?

.mailmap

@@ -41,11 +41,10 @@ Alex Deucher <alexdeucher@gmail.com> <alex@botch2.(none)>
 Alex Deucher <alexdeucher@gmail.com> <alex@cube.(none)>
 Alex Deucher <alexdeucher@gmail.com> <alex@samba.(none)>
 
-Alyssa Rosenzweig <alyssa@rosenz.ca> <alyssa.rosenzweig@intel.com>
-Alyssa Rosenzweig <alyssa@rosenz.ca> <alyssa.rosenzweig@collabora.com>
-Alyssa Rosenzweig <alyssa@rosenz.ca> <alyssa@rosenzweig.io>
-Alyssa Rosenzweig <alyssa@rosenz.ca> <a@rosenzweig.io>
-Alyssa Rosenzweig <alyssa@rosenz.ca> <alyssa@collabora.com>
+Alyssa Rosenzweig <alyssa@rosenzweig.io> <alyssa.rosenzweig@intel.com>
+Alyssa Rosenzweig <alyssa@rosenzweig.io> <alyssa.rosenzweig@collabora.com>
+Alyssa Rosenzweig <alyssa@rosenzweig.io> <a@rosenzweig.io>
+Alyssa Rosenzweig <alyssa@rosenzweig.io> <alyssa@collabora.com>
 
 Andreas Fänger <a.faenger@e-sign.com> <a.faenger@e-sign.com>
 
@@ -291,9 +290,6 @@ Ian Romanick <ian.d.romanick@intel.com> <idr@us.ibm.com>
 
 Icecream95 <ixn@disroot.org> <ixn@keemail.me>
 
-Icenowy Zheng <uwu@icenowy.me> <zhengxingda@iscas.ac.cn>
-Icenowy Zheng <uwu@icenowy.me> <icenowy@aosc.io>
-
 Igor Gnatenko <i.gnatenko.brain@gmail.com> <ignatenko@redhat.com>
 
 Illia Iorin <illia.iorin@globallogic.com> <illia.iorin@gmail.com>
@@ -430,9 +426,6 @@ Lionel Landwerlin <lionel.g.landwerlin@intel.com> <llandwerlin@gmail.com>
 
 Liviu Prodea <liviuprodea@yahoo.com>
 
-Lorenzo Rossi <lorenzo.rossi@collabora.com> <snowycoder@gmail.com>
-Lorenzo Rossi <lorenzo.rossi@collabora.com> <git@rossilorenzo.dev>
-
 Lucas Fryzek <lfryzek@igalia.com> <lucas.fryzek@gmail.com>
 
 Lucas Stach <dev@lynxeye.de> <l.stach@pengutronix.de>

.marge/hooks/pipeline_message.py

@@ -50,7 +50,7 @@ def get_problem_jobs(jobs: list[dict[str, Any]]):
     for job in jobs:
         if any(ignore.lower() in job["stage"] for ignore in ignore_stage_list):
             continue
-        if job["status"] != "success":
+        if job["status"] in {"failed", "canceled"}:
             problem_jobs.append(job)
     return problem_jobs
 
@@ -277,12 +277,6 @@ async def process_single_job(session, project_id, job):
     job_name = job.get("name", "Unnamed Job")
     message = f"[{job_name}]({job_url})"
 
-    if job["status"] == "running":
-        return f"{message}: still running<br>"
-
-    if job["status"] == "manual":
-        return f"{message}: waiting for manual action<br>"
-
     # if a job times out it's cancelled, so worth mentioning here
     if job["status"] == "canceled":
         return f"{message}: canceled<br>"
@@ -352,7 +346,7 @@ async def main(pipeline_id: str, project_id: str = "176") -> str:
                 session, project_id, pipeline_id
             )
             logging.debug(f"Pipeline status: {pipeline_status}")
-            if pipeline_status == "success":
+            if pipeline_status != "failed":
                 return message
 
             jobs = await get_jobs_for_pipeline(session, project_id, pipeline_id)

.mr-label-maker.yml

@@ -122,13 +122,10 @@ merge_requests:
     paths:
         '^.gitlab/issue_templates/': ['docs']
         '^.gitlab-ci': ['CI']
-        '^bin/ci/': ['CI']
-        '^.ci-farms(-disabled)?/collabora': ['CI', 'radeonsi', 'RADV', 'iris', 'ANV', 'panfrost', 'panvk', 'freedreno', 'turnip', 'venus', 'zink']
         '^.*/gitlab-ci(-inc)?.yml': ['CI']
         '^.*/ci/deqp-.*\.toml': ['CI']
         '^.*/ci/.*-(fails|flakes|skips)\.txt': ['CI-Expectations']
         '^.*/ci/(restricted-)?traces-.*\.yml': ['CI-Expectations', 'trace']
-        '^.*/ci/traces-.*\.toml': ['CI-Expectations', 'trace']
         '^.*/ci/.*-validation-settings\.txt': ['CI-Expectations']
         '^.*/ci/.*-vkd3d\.txt': ['CI-Expectations']
         '^.gitlab-ci/windows/': ['Windows']
@@ -164,6 +161,7 @@ merge_requests:
         '^src/egl/': ['EGL']
         '^src/egl/drivers/wgl/': ['wgl']
         '^src/etnaviv/': ['etnaviv']
+        '^src/freedreno/afuc/': ['freedreno']
         '^src/freedreno/common/': ['freedreno']
         '^src/freedreno/computerator/': ['freedreno']
         '^src/freedreno/decode/': ['freedreno']
@@ -175,7 +173,6 @@ merge_requests:
         '^src/freedreno/ir3/': ['ir3']
         '^src/freedreno/isa/': ['freedreno']
         '^src/freedreno/perfcntrs/': ['freedreno']
-        '^src/freedreno/qrisc/': ['freedreno']
         '^src/freedreno/registers/': ['freedreno']
         '^src/freedreno/rnn/': ['freedreno']
         '^src/freedreno/vulkan/': ['turnip']
@@ -234,7 +231,7 @@ merge_requests:
         '^src/gallium/targets/mediafoundation/': ['mediafoundation']
         '^src/gallium/tests/': ['gallium']
         '^src/gallium/tools/': ['gallium']
-        '^src/gallium/winsys/amdgpu/': ['radeonsi']
+        # '^src/gallium/winsys/amdgpu/': ['']
         '^src/gallium/winsys/crocus/': ['crocus']
         '^src/gallium/winsys/d3d12/': ['d3d12']
         '^src/gallium/winsys/etnaviv/': ['etnaviv']
@@ -246,7 +243,7 @@ merge_requests:
         '^src/gallium/winsys/lima/': ['lima']
         '^src/gallium/winsys/nouveau/': ['nouveau']
         '^src/gallium/winsys/panfrost/': ['panfrost']
-        '^src/gallium/winsys/radeon/': ['r300', 'r600', 'radeonsi']
+        # '^src/gallium/winsys/radeon/': ['radeon']
         '^src/gallium/winsys/svga/': ['svga']
         # '^src/gallium/winsys/sw/': ['']
         '^src/gallium/winsys/sw/gdi/': ['wgl']
@@ -289,7 +286,6 @@ merge_requests:
         '^src/microsoft/compiler/': ['d3d12']
         '^src/microsoft/spirv_to_dxil/': ['dozen']
         '^src/microsoft/vulkan/': ['dozen']
-        '^src/nouveau/ci/.*nvk.*': ['NVK']
         '^src/nouveau/codegen/': ['nouveau']
         '^src/nouveau/compiler/': ['NAK']
         '^src/nouveau/drm-shim/': ['nouveau']
@@ -312,9 +308,6 @@ merge_requests:
         '^src/util/00-mesa-defaults.conf': ['drirc']
         '^src/vulkan/': ['vulkan']
         '^src/vulkan/wsi/': ['wsi']
-        '^src/vulkan/wsi/wsi_common_metal': ['macOS']
-        '^src/vulkan/wsi/wsi_common_wayland.c': ['wayland']
-        '^src/vulkan/wsi/wsi_common_x11.c': ['X11']
         '^VERSION$': ['mesa-release']
 
         'Android': ['android']

CODEOWNERS

@@ -26,7 +26,6 @@ meson.build @dbaker @eric
 
 # Build system - Android
 /android/ @roman.stratiienko
-/bin/update-android-headers.sh @zzyiwei
 
 # Compatibility headers
 /include/c99* @xexaxo
@@ -47,8 +46,6 @@ meson.build @dbaker @eric
 /src/vulkan/ @gfxstrand
 /include/vulkan/ @gfxstrand
 
-# Android Gralloc
-/src/util/u_gralloc/ @roman.stratiienko @zzyiwei
 
 #############
 # PLATFORMS #
@@ -97,9 +94,6 @@ meson.build @dbaker @eric
 /src/vulkan/wsi/wsi_common_display.* @keithp
 /src/*/vulkan/*_wsi_display.c @keithp
 
-# Vulkan - Android
-/include/vulkan/vk_android_native_buffer.h @zzyiwei
-/src/vulkan/runtime/vk_android.* @zzyiwei
 
 ######
 # CI #
@@ -112,8 +106,6 @@ gitlab-ci*.yml @eric
 # Broadcom
 /src/broadcom/ci/ @jasuarez @chema
 
-# Lima
-/src/gallium/drivers/lima/ci/ @enunes
 
 ###########
 # Drivers #
@@ -124,9 +116,9 @@ gitlab-ci*.yml @eric
 /src/gallium/drivers/asahi/ @alyssa
 
 # Broadcom
-/src/broadcom/ @chema @jasuarez @itoral @apinheiro
-/src/gallium/drivers/v3d/ @chema @jasuarez @itoral @apinheiro
-/src/gallium/drivers/vc4/ @chema @jasuarez @itoral @apinheiro
+/src/broadcom/ @itoral @apinheiro
+/src/gallium/drivers/v3d/ @itoral @chema @jasuarez
+/src/gallium/drivers/vc4/ @itoral @chema @jasuarez
 
 # Freedreno
 /src/gallium/drivers/freedreno/ @robclark
@@ -141,7 +133,6 @@ gitlab-ci*.yml @eric
 /include/drm-uapi/i915_drm.h @kwg @llandwerlin @idr
 /include/pci_ids/i*_pci_ids.h @kwg @llandwerlin @idr
 /src/intel/ @kwg @llandwerlin @idr
-/src/intel/compiler/jay/ @alyssa @kwg
 /src/gallium/winsys/iris/ @kwg @llandwerlin @idr
 /src/gallium/drivers/iris/ @kwg @llandwerlin @idr
 /src/gallium/drivers/i915/ @anholt
@@ -150,15 +141,12 @@ gitlab-ci*.yml @eric
 /src/kosmickrisp @aitor
 /src/kosmickrisp/compiler @agoldmints
 
-# Lima
-/src/gallium/drivers/lima/ @enunes @anarsoul
-
 # Microsoft
 /src/microsoft/ @jenatali
 /src/gallium/drivers/d3d12/ @jenatali
 
 # Panfrost
-/src/panfrost/ @bbrezillon @larsivsi @chrpil
+/src/panfrost/ @bbrezillon
 /src/panfrost/midgard @italove
 /src/gallium/drivers/panfrost/ @bbrezillon
 

VERSION

@@ -1 +1 @@
-26.2.0-devel
+26.0.5

android/mesa3d_cross.mk

@@ -94,7 +94,6 @@ MESON_GEN_NINJA := \
 	-Dgbm-backends-path=/vendor/$(MESA3D_LIB_DIR)                                \
 	-Degl=$(if $(BOARD_MESA3D_GALLIUM_DRIVERS),enabled,disabled)                 \
 	-Dllvm=$(if $(MESON_GEN_LLVM_STUB),enabled,disabled)                         \
-	-Damdgpu-virtio=$(if $(filter true,$(BOARD_MESA3D_AMDGPU_VIRTIO)),true,false)\
 	-Dcpp_rtti=false                                                             \
 	-Dlmsensors=disabled                                                         \
 	-Dandroid-libbacktrace=disabled                                              \

bin/ci/ci_run_n_monitor.py

@@ -429,7 +429,7 @@ def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser(
         description="Tool to trigger a subset of container jobs "
         + "and monitor the progress of a test job",
-        epilog="Example: %(prog)s --rev $(git rev-parse HEAD) "
+        epilog="Example: mesa-monitor.py --rev $(git rev-parse HEAD) "
         + '--target ".*traces" ',
     )
     parser.add_argument(

bin/ci/requirements.txt

@@ -11,4 +11,3 @@ rich==14.1.*
 ruamel.yaml.clib==0.2.*
 ruamel.yaml==0.17.*
 tabulate==0.9.*
-tomledit==1.*

bin/ci/update_traces_checksum.py

@@ -17,8 +17,6 @@ import re
 import json
 import sys
 from ruamel.yaml import YAML
-from subprocess import check_output
-from tomledit import Document
 
 import gitlab
 from gitlab_common import (get_gitlab_project, read_token, wait_for_pipeline,
@@ -29,121 +27,6 @@ from rich import print
 DESCRIPTION_FILE = "export PIGLIT_REPLAY_DESCRIPTION_FILE=.*/install/(.*)$"
 DEVICE_NAME = "(?:declare -x|export) PIGLIT_REPLAY_DEVICE_NAME='?([^']*)'?$"
 
-def gather_job_results_yml(cur_job):
-    log: list[str] = cur_job.trace().decode().splitlines()
-    filename: str = ''
-    dev_name: str = ''
-    for logline in log:
-        desc_file = re.search(DESCRIPTION_FILE, logline)
-        device_name = re.search(DEVICE_NAME, logline)
-        if desc_file:
-            filename = desc_file.group(1)
-        if device_name:
-            dev_name = device_name.group(1)
-
-    if not filename or not dev_name:
-        print("[red]Couldn't find device name or YML file in the logs!")
-        return
-
-    print(f"👁 Found {dev_name} and file {filename}")
-
-    # find filename in Mesa source
-    traces_file = glob.glob('./**/' + filename, recursive=True)
-    # write into it
-    with open(traces_file[0], 'r', encoding='utf-8') as target_file:
-        yaml = YAML()
-        yaml.compact(seq_seq=False, seq_map=False)
-        yaml.version = 1,2
-        yaml.width = 2048  # do not break the text fields
-        yaml.default_flow_style = None
-        target = yaml.load(target_file)
-
-        # parse artifact
-        results_json_bz2 = cur_job.artifact("results/results.json.bz2")
-        results_json = bz2.decompress(results_json_bz2).decode("utf-8", errors="replace")
-        results = json.loads(results_json)
-
-        for _, value in results["tests"].items():
-            if (
-                not value['images'] or
-                not value['images'][0] or
-                "image_desc" not in value['images'][0]
-            ):
-                continue
-
-            trace: str = value['images'][0]['image_desc']
-            checksum: str = value['images'][0]['checksum_render']
-
-            if not checksum:
-                print(f"[red]{dev_name}: {trace}: checksum is missing! Crash?")
-                continue
-
-            if checksum == "error":
-                print(f"[red]{dev_name}: {trace}: crashed")
-                continue
-
-            if target['traces'][trace][dev_name].get('checksum') == checksum:
-                continue
-
-            if "label" in target['traces'][trace][dev_name]:
-                print(
-                    f"{dev_name}: {trace}: please verify that label "
-                    f"[blue]{target['traces'][trace][dev_name]['label']}[/blue] "
-                    "is still valid"
-                )
-
-            print(f"[green]{dev_name}: {trace}: checksum updated")
-            target['traces'][trace][dev_name]['checksum'] = checksum
-
-    with open(traces_file[0], 'w', encoding='utf-8') as target_file:
-        yaml.dump(target, target_file)
-
-
-def update_toml_checksum(toml_file, trace_path, device, old_checksum, new_checksum):
-    with open(toml_file, 'r', encoding='utf-8') as f:
-        doc = Document.parse(f.read())
-
-    for table in doc["traces"]:
-        if table["path"].value != trace_path:
-            continue
-        try:
-            table["devices"][device]["checksum"] = new_checksum
-        except KeyError:
-            return False
-        with open(toml_file, 'w', encoding='utf-8') as f:
-            f.write(doc.as_toml())
-        return True
-
-    return False
-
-
-def gather_job_results_toml(cur_job) -> None:
-    """Process checksum-changes.json artifact (gpu-trace-perf replay format)"""
-    toml_files = glob.glob('./**/traces-*.toml', recursive=True)
-
-    changes_json = cur_job.artifact("results/checksum-changes.json")
-    changes = json.loads(changes_json.decode("utf-8"))
-
-    for change in changes:
-        device = change['device']
-        trace = change['trace']
-        old_checksum = change['old_checksum']
-        new_checksum = change['new_checksum']
-
-        if not new_checksum:
-            print(f"[red]{device}: {trace}: no new checksum (crash?)")
-            continue
-
-        updated = False
-        for toml_file in toml_files:
-            if update_toml_checksum(toml_file, trace, device, old_checksum, new_checksum):
-                print(f"[green]{device}: {trace}: checksum updated")
-                updated = True
-                break
-
-        if not updated:
-            print(f"[red]{device}: {trace}: not found in any traces TOML file")
-
 
 def gather_results(
     project,
@@ -151,17 +34,81 @@ def gather_results(
 ) -> None:
     """Gather results"""
 
-    target_jobs_regex = re.compile(".*-traces(-restricted)?([:].*)?$")
+    target_jobs_regex = re.compile(".*-traces([:].*)?$")
 
     for job in pipeline.jobs.list(all=True, sort="desc"):
         if target_jobs_regex.match(job.name) and job.status == "failed":
             cur_job = project.jobs.get(job.id)
             # get variables
             print(f"👁  {job.name}...")
-            try:
-                gather_job_results_toml(cur_job)
-            except Exception:
-                gather_job_results_yml(cur_job)
+            log: list[str] = cur_job.trace().decode().splitlines()
+            filename: str = ''
+            dev_name: str = ''
+            for logline in log:
+                desc_file = re.search(DESCRIPTION_FILE, logline)
+                device_name = re.search(DEVICE_NAME, logline)
+                if desc_file:
+                    filename = desc_file.group(1)
+                if device_name:
+                    dev_name = device_name.group(1)
+
+            if not filename or not dev_name:
+                print("[red]Couldn't find device name or YML file in the logs!")
+                return
+
+            print(f"👁 Found {dev_name} and file {filename}")
+
+            # find filename in Mesa source
+            traces_file = glob.glob('./**/' + filename, recursive=True)
+            # write into it
+            with open(traces_file[0], 'r', encoding='utf-8') as target_file:
+                yaml = YAML()
+                yaml.compact(seq_seq=False, seq_map=False)
+                yaml.version = 1,2
+                yaml.width = 2048  # do not break the text fields
+                yaml.default_flow_style = None
+                target = yaml.load(target_file)
+
+                # parse artifact
+                results_json_bz2 = cur_job.artifact("results/results.json.bz2")
+                results_json = bz2.decompress(results_json_bz2).decode("utf-8", errors="replace")
+                results = json.loads(results_json)
+
+                for _, value in results["tests"].items():
+                    if (
+                        not value['images'] or
+                        not value['images'][0] or
+                        "image_desc" not in value['images'][0]
+                    ):
+                        continue
+
+                    trace: str = value['images'][0]['image_desc']
+                    checksum: str = value['images'][0]['checksum_render']
+
+                    if not checksum:
+                        print(f"[red]{dev_name}: {trace}: checksum is missing! Crash?")
+                        continue
+
+                    if checksum == "error":
+                        print(f"[red]{dev_name}: {trace}: crashed")
+                        continue
+
+                    if target['traces'][trace][dev_name].get('checksum') == checksum:
+                        continue
+
+                    if "label" in target['traces'][trace][dev_name]:
+                        print(
+                            f"{dev_name}: {trace}: please verify that label "
+                            f"[blue]{target['traces'][trace][dev_name]['label']}[/blue] "
+                            "is still valid"
+                             )
+
+                    print(f"[green]{dev_name}: {trace}: checksum updated")
+                    target['traces'][trace][dev_name]['checksum'] = checksum
+
+            with open(traces_file[0], 'w', encoding='utf-8') as target_file:
+                yaml.dump(target, target_file)
+
 
 
 def parse_args() -> None:
@@ -171,7 +118,7 @@ def parse_args() -> None:
         epilog="Example: update_traces_checksum.py --rev $(git rev-parse HEAD) "
     )
     parser.add_argument(
-        "--rev", metavar="revision", help="repository git revision", default='HEAD'
+        "--rev", metavar="revision", help="repository git revision",
     )
     parser.add_argument(
         "--token",
@@ -206,9 +153,8 @@ if __name__ == "__main__":
             if not args.rev:
                 print('error: the following arguments are required: --rev')
                 sys.exit(1)
-            sha = check_output(['git', 'rev-parse', args.rev]).decode('ascii').strip()
-            print(f"Revision: {sha}")
-            (pipe, cur_project) = wait_for_pipeline([cur_project], sha)
+            print(f"Revision: {args.rev}")
+            (pipe, cur_project) = wait_for_pipeline([cur_project], args.rev)
         print(f"Pipeline: {pipe.web_url}")
         gather_results(cur_project, pipe)
 

bin/drm-shim.py

@@ -1,171 +0,0 @@
-#!/usr/bin/python3
-#
-# Copyright 2026 Intel Corporation
-# SPDX-License-Identifier: MIT
-
-import argparse
-import os
-import sys
-import subprocess
-
-ALIASES = {
-    "amd": "gfx1201",
-    "asahi": "m1",
-    "freedreno": "a750",
-    "intel": "lnl",
-    "lima": "lima-mali450",
-    "nouveau": "turing",
-    "v3d": "rpi5",
-    "vc4": "rpi3",
-
-    "a3xx": "a306",
-    "a5xx": "a530",
-    "a6xx": "a660",
-    "a7xx": "a750",
-
-    "lima-mali450": "mali450",
-    "panfrost-t860": "t860",
-    "panfrost-g52": "g52",
-    "panfrost-g57": "g57",
-    "panfrost-g72": "g72",
-    "panfrost-g610": "g610",
-    "panfrost-g925": "g925",
-}
-
-TARGETS = {
-    "stoney": ["amd", "STONEY"],
-    "raven": ["amd", "RAVEN2"],
-    "cezanne": ["amd", "RENOIR"],
-    "mendocino": ["amd", "RAPHAEL_MENDOCINO"],
-    "vangogh": ["amd", "VANGOGH"],
-    "navi21": ["amd", "NAVI21"],
-    "navi31": ["amd", "NAVI31"],
-    "gfx1201": ["amd", "GFX1201"],
-
-    "m1": ["asahi", None],
-
-    "a306": ["freedreno", "307"],
-    "a530": ["freedreno", "530"],
-    "a618": ["freedreno", "618"],
-    "a660": ["freedreno", "660"],
-    "a750": ["freedreno", "750"],
-
-    "skl": ["intel", "skl"],
-    "apl": ["intel", "apl"],
-    "glk": ["intel", "glk"],
-    "kbl": ["intel", "kbl"],
-    "jsl": ["intel", "jsl"],
-    "tgl": ["intel", "tgl"],
-    "adl": ["intel", "adl"],
-    "rpl": ["intel", "rpl"],
-    "lnl": ["intel", "lnl"],
-    "ptl": ["intel", "ptl"],
-
-    "mali450": ["lima", None],
-
-    "turing": ["nouveau", "160"],
-
-    "t860": ["panfrost", "860"],
-    "g52": ["panfrost", "7212"],
-    "g57": ["panfrost", "9093"],
-    "g72": ["panfrost", "6221"],
-    "g610": ["panfrost", "a867"],
-    "g925": ["panfrost", "d830:4"],
-
-    "rpi4": ["v3d", "42"],
-    "rpi5": ["v3d", "71"],
-
-    "rpi3": ["vc4", None],
-
-}
-
-LD_PRELOAD = {
-    "amd": "src/amd/drm-shim/libamdgpu_noop_drm_shim.so",
-    "asahi": "src/asahi/drm-shim/libasahi_noop_drm_shim.so",
-    "freedreno": "src/freedreno/drm-shim/libfreedreno_noop_drm_shim.so",
-    "intel": "src/intel/tools/libintel_noop_drm_shim.so",
-    "nouveau": "src/nouveau/drm-shim/libnouveau_noop_drm_shim.so",
-    "panfrost": "src/panfrost/drm-shim/libpanfrost_noop_drm_shim.so",
-    "v3d": "src/broadcom/drm-shim/libv3d_noop_drm_shim.so",
-    "vc4": "src/broadcom/drm-shim/libvc4_noop_drm_shim.so",
-}
-
-SHIM_VAR = {
-    "amd": "AMDGPU_GPU_ID",
-    "freedreno": "FD_GPU_ID",
-    "intel": "INTEL_STUB_GPU_PLATFORM",
-    "nouveau": "NOUVEAU_CHIPSET",
-    "panfrost": "PAN_GPU_ID",
-    "v3d": "V3D_GPU_ID",
-}
-
-DISASM = {
-    "amd": [("AMD_DEBUG", "vs,ps,gs,tcs,tes,cs,ts,ms,nir,aco,asm"), ("RADV_DEBUG", "shaders")],
-    "asahi": [("AGX_MESA_DEBUG", "shaders")],
-    "freedreno": [("IR3_SHADER_DEBUG", "disasm")],
-    "intel": [("INTEL_DEBUG", "vs,tcs,tes,gs,fs,cs,mesh,task,rt")],
-    "nouveau": [("NAK_DEBUG", "print")],
-    "panfrost": [
-        ("MIDGARD_MESA_DEBUG", "shaders"),
-        ("BIFROST_MESA_DEBUG", "shaders")
-    ],
-    "vc4": [("VC4_DEBUG", "nir,vir,qpu")],
-    "v3d": [("V3D_DEBUG", "nir,vir,qpu")],
-}
-
-if __name__ == "__main__":
-    epilog = "Known GPUs: " + ' '.join([f'{target}' for target in TARGETS])
-    parser = argparse.ArgumentParser(
-        prog='drm-shim',
-        description='Run a program under drm-shim',
-        epilog=epilog)
-    parser.add_argument('gpu', help="Driver name, CI job or GPU model")
-    parser.add_argument('-d', '--disasm', action='store_true',
-                        help="Disassemble shaders")
-    parser.add_argument('-z', '--zink', action='store_true',
-                        help="Use Zink for OpenGL instead of the native driver")
-    args, rest = parser.parse_known_args()
-    command = ' '.join(rest)
-
-    build = os.environ.get('DRM_SHIM_PATH')
-    if build is None:
-        print("Must run inside a Mesa meson devenv")
-        sys.exit(1)
-
-    # Force zink for zink CI jobs
-    if args.gpu.startswith('zink-'):
-        args.zink = True
-
-    # Drop common CI job prefixes/suffixes
-    prefixes = ["zink-", "anv-", "radv-", "tu-", "radeonsi-"]
-    suffixes = ["-valve", "-gl", "-gles", "-gles2",
-                "-vk", "-piglit", "-glcts", "-vkcts"]
-
-    for prefix in prefixes:
-        args.gpu = args.gpu.removeprefix(prefix)
-
-    for suffix in suffixes:
-        args.gpu = args.gpu.removesuffix(suffix)
-
-    if args.gpu in ALIASES:
-        args.gpu = ALIASES[args.gpu]
-
-    if args.gpu not in TARGETS:
-        print(f"Unknown target {args.gpu}")
-        sys.exit(1)
-
-    driver, model = TARGETS[args.gpu]
-    env = os.environ.copy()
-    env['LD_PRELOAD'] = f'{build}/{LD_PRELOAD[driver]}'
-
-    if model is not None:
-        env[SHIM_VAR[driver]] = model
-
-    if args.zink:
-        env['MESA_LOADER_DRIVER_OVERRIDE'] = 'zink'
-
-    if args.disasm:
-        for (key, val) in DISASM[driver]:
-            env[key] = val
-
-    subprocess.call(command, env=env, shell=True)

bin/gen_release_notes.py

@@ -40,7 +40,6 @@ import docutils.utils
 import docutils.parsers.rst.states as states
 
 CURRENT_GL_VERSION = '4.6'
-CURRENT_CL_VERSION = '3.1'
 CURRENT_VK_VERSION = '1.4'
 
 TEMPLATE = Template(textwrap.dedent("""\
@@ -62,10 +61,6 @@ TEMPLATE = Template(textwrap.dedent("""\
     ${gl_version} is **only** available if requested at context creation.
     Compatibility contexts may report a lower version depending on each driver.
 
-    Mesa ${this_version} implements the OpenCL ${cl_version} API, but the version reported by
-    the CL_DEVICE_VERSION, CL_DEVICE_NUMERIC_VERSION and CL_DEVICE_OPENCL_C_ALL_VERSIONS
-    clGetDeviceInfo queries depends on the particular driver being used.
-
     Mesa ${this_version} implements the Vulkan ${vk_version} API, but the version reported by
     the apiVersion property of the VkPhysicalDeviceProperties struct
     depends on the particular driver being used.
@@ -370,7 +365,6 @@ async def main() -> None:
                 changes=walk_shortlog(shortlog),
                 features=get_features(is_point_release),
                 gl_version=CURRENT_GL_VERSION,
-                cl_version=CURRENT_CL_VERSION,
                 this_version=this_version,
                 header=header,
                 header_underline=header_underline,

bin/khronos-update.py

@@ -164,32 +164,21 @@ SOURCES = [
         'api': 'opencl',
         'inc_folder': 'CL',
         'sources': [
+            Source('include/CL/opencl.h',                        'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/opencl.h'),
             Source('include/CL/cl.h',                            'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl.h'),
+            Source('include/CL/cl_platform.h',                   'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_platform.h'),
+            Source('include/CL/cl_gl.h',                         'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_gl.h'),
+            Source('include/CL/cl_gl_ext.h',                     'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_gl_ext.h'),
+            Source('include/CL/cl_ext.h',                        'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_ext.h'),
+            Source('include/CL/cl_version.h',                    'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_version.h'),
+            Source('include/CL/cl_icd.h',                        'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_icd.h'),
+            Source('include/CL/cl_egl.h',                        'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_egl.h'),
             Source('include/CL/cl_d3d10.h',                      'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_d3d10.h'),
             Source('include/CL/cl_d3d11.h',                      'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_d3d11.h'),
             Source('include/CL/cl_dx9_media_sharing.h',          'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_dx9_media_sharing.h'),
             Source('include/CL/cl_dx9_media_sharing_intel.h',    'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_dx9_media_sharing_intel.h'),
-            Source('include/CL/cl_egl.h',                        'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_egl.h'),
-            Source('include/CL/cl_ext.h',                        'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_ext.h'),
             Source('include/CL/cl_ext_intel.h',                  'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_ext_intel.h'),
-            Source('include/CL/cl_function_types.h',             'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_function_types.h'),
-            Source('include/CL/cl_gl.h',                         'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_gl.h'),
-            Source('include/CL/cl_gl_ext.h',                     'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_gl_ext.h'),
-            Source('include/CL/cl_half.h',                       'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_half.h'),
-            Source('include/CL/cl_icd.h',                        'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_icd.h'),
-            Source('include/CL/cl_layer.h',                      'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_layer.h'),
-            Source('include/CL/cl_platform.h',                   'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_platform.h'),
             Source('include/CL/cl_va_api_media_sharing_intel.h', 'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_va_api_media_sharing_intel.h'),
-            Source('include/CL/cl_version.h',                    'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/cl_version.h'),
-            Source('include/CL/opencl.h',                        'https://github.com/KhronosGroup/OpenCL-Headers/raw/main/CL/opencl.h'),
-        ],
-    },
-
-    {
-        'api': 'opencl_intel',
-        'inc_folder': 'CL_intel',
-        'sources': [
-            Source('include/CL_intel/cl_ext_private.h', 'https://github.com/intel/compute-runtime/raw/master/opencl/extensions/public/cl_ext_private.h'),
         ],
     },
 

bin/people.csv

@@ -78,7 +78,7 @@ lcagustini, lucas.c.agustini@gmail.com, lcagustini
 Leonard Göhrs, l.goehrs@pengutronix.de, hnez
 Lionel Landwerlin, lionel.g.landwerlin@intel.com, llandwerlin
 liuqiang, liuqiang@kylinos.cn, genhoayi
-Lorenzo Rossi, lorenzo.rossi@collabora.com, SnowyCoder
+Lorenzo Rossi, snowycoder@gmail.com, SnowyCoder
 Lucas De Marchi, lucas.demarchi@intel.com, demarchi
 Lucas Stach, dev@lynxeye.de, lynxeye
 Lukas Lipp, lippls@hotmail.com, fknfilewalker

bin/rb.py

@@ -76,7 +76,6 @@ if __name__ == "__main__":
                         description='Add review trailers')
     parser.add_argument('person', nargs='+', help="Reviewer's username, first name, or full name")
     parser.add_argument('-a', '--ack', action='store_true', help="Apply an acked-by tag")
-    parser.add_argument('-t', '--test', action='store_true', help="Apply an tested-by tag")
     parser.add_argument('-d', '--dry-run', action='store_true',
                         help="Print trailer without applying")
     parser.add_argument('-r', '--rebase', nargs='?',
@@ -89,8 +88,6 @@ if __name__ == "__main__":
         relevant_args = [sys.argv[0]]
         if args.ack:
             relevant_args.append("--ack")
-        elif args.test:
-            relevant_args.append("--test")
 
         relevant_args += args.person
 
@@ -110,12 +107,7 @@ if __name__ == "__main__":
         if person is None:
             print(f'Could not uniquely identify {p}, skipping')
 
-        trailer = 'Reviewed-by'
-        if args.ack:
-            trailer = 'Acked-by'
-        elif args.test:
-            trailer = 'Tested-by'
-
+        trailer = 'Acked-by' if args.ack else 'Reviewed-by'
         trailer = f'{trailer}: {person[0]} <{person[1]}>'
 
         if args.dry_run: