VERSION: bump for 25.3.2

Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>

.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

.editorconfig

@@ -8,7 +8,7 @@ charset = utf-8
 insert_final_newline = true
 tab_width = 8
 
-[*.{c,h,cpp,hpp,cc,hh,y,yy,cl,glsl}]
+[*.{c,h,cpp,hpp,cc,hh,y,yy,cl}]
 indent_style = space
 indent_size = 3
 max_line_length = 78

.git-blame-ignore-revs

@@ -77,6 +77,3 @@ c7bf3b69ebc8f2252dbf724a4de638e6bb2ac402
 
 # freedreno/a6xx: The great register renaming
 7fd99c88b9cd5c0c8c1cb3e92383acac5cb8220b
-
-# radv: re-format using clang-format
-1492de1bc3610539b93d8ad17892e7139cd4b05d

.gitlab-ci.yml

@@ -184,7 +184,6 @@ stages:
   - freedreno-nightly
   - etnaviv
   - etnaviv-nightly
-  - imagination-nightly
   - software-renderer
   - software-renderer-nightly
   - layered-backends
@@ -234,14 +233,13 @@ 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
     # changed, else we'll just use the already-built containers
     - if: *is-merge-attempt
       changes: &image_tags_path
-        - .gitlab-ci.yml
         - .gitlab-ci/image-tags.yml
       when: on_success
     # Skip everything for pre-merge and merge pipelines which don't change
@@ -285,7 +283,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 +342,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
 
@@ -50,7 +79,3 @@ spec@!opengl 1.1@read-front
 # Also, individually, it was disabled in most of the tests as it is
 # either too slow or results in an OOM
 spec@!opengl 1.1@streaming-texture-leak
-
-# Fails everywhere, invalid test: https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/6317
-dEQP-VK.spirv_assembly.instruction.*.float_controls2.*.input_args.mat_det_testedWithout_NotNaN_arg1_nan_arg2_one_res_nan*
-dEQP-VK.spirv_assembly.instruction.*.float_controls2.*.input_args.cross_testedWithout_NotNaN_arg1_nan_arg2_one_res_nan*

.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
+$ADB wait-for-device root
-for i in $(seq 1 5); do
+sleep 1
-    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
 
 # 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
+# Remove and replace Vulkan drivers:
-if [ "${CUTTLEFISH_GPU_MODE:-}" = "venus" ] || [ "${CUTTLEFISH_GPU_MODE:-}" = "venus_guest_angle" ]; then
+# - 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,11 @@
-# Skip these tests when running fractional dEQP batches, as the AHB and WSI tests are
+# Skip these tests when running fractional dEQP batches, as the AHB tests are expected
-# expected to be handled separately in non-fractional runs within the deqp-runner suite.
+# 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.*
+
+# These tests cause hangs and need to be skipped for now.
+dEQP-VK.synchronization*

.gitlab-ci/angle-skips.txt

@@ -5,3 +5,12 @@ dEQP-GLES3.functional.transform_feedback.random.*
 dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.*_array_element
 dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.type.*.array.*
 KHR-GLES31.core.program_interface_query.transform-feedback-types
+
+# CTS bug - https://gerrit.khronos.org/c/vk-gl-cts/+/17901
+# https://issues.angleproject.org/issues/436377594#comment6
+dEQP-GLES31.functional.debug.negative_coverage.log.advanced_blend.attachment_advanced_equation
+dEQP-GLES31.functional.debug.negative_coverage.log.advanced_blend.blend_qualifier_mismatch
+dEQP-GLES31.functional.debug.negative_coverage.log.compute.invalid_program_query
+dEQP-GLES31.functional.debug.negative_coverage.log.shader.link_program
+dEQP-GLES31.functional.debug.negative_coverage.log.shader.use_program
+dEQP-GLES31.functional.debug.negative_coverage.log.tessellation.single_tessellation_stage

.gitlab-ci/bare-metal/gitlab-ci.yml

@@ -31,6 +31,7 @@
       optional: true
     - job: debian-arm32
       artifacts: false
+    - !reference [.required-for-hardware-jobs, needs]
 
 # ARM64 testing of bare-metal boards attached to an x86 gitlab-runner system
 .baremetal-test-arm64-gl:
@@ -45,6 +46,7 @@
       optional: true
     - job: debian-arm64
       artifacts: false
+    - !reference [.required-for-hardware-jobs, needs]
 
 # ARM64 testing of bare-metal boards attached to an x86 gitlab-runner system
 .baremetal-test-arm64-vk:
@@ -59,6 +61,7 @@
       optional: true
     - job: debian-arm64
       artifacts: false
+    - !reference [.required-for-hardware-jobs, needs]
 
 # ARM32/64 testing of bare-metal boards attached to an x86 gitlab-runner system, using an asan mesa build
 .baremetal-arm32-asan-test-gl:
@@ -70,6 +73,7 @@
       optional: true
     - job: debian-arm32-asan
       artifacts: false
+    - !reference [.required-for-hardware-jobs, needs]
 
 .baremetal-arm64-asan-test-gl:
   variables:
@@ -80,6 +84,7 @@
       optional: true
     - job: debian-arm64-asan
       artifacts: false
+    - !reference [.required-for-hardware-jobs, needs]
 
 .baremetal-arm64-asan-test-vk:
   variables:
@@ -90,6 +95,7 @@
       optional: true
     - job: debian-arm64-asan
       artifacts: false
+    - !reference [.required-for-hardware-jobs, needs]
 
 .baremetal-arm64-ubsan-test-gl:
   extends:
@@ -102,6 +108,7 @@
       optional: true
     - job: debian-arm64-ubsan
       artifacts: false
+    - !reference [.required-for-hardware-jobs, needs]
 
 .baremetal-arm64-ubsan-test-vk:
   extends:
@@ -114,6 +121,7 @@
       optional: true
     - job: debian-arm64-ubsan
       artifacts: false
+    - !reference [.required-for-hardware-jobs, needs]
 
 .baremetal-deqp-test:
   variables:

.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

@@ -13,7 +13,7 @@ make-git-archive:
     # Compactify the .git directory
     - git gc --aggressive
     # Download & cache the perfetto subproject as well.
-    - rm -rf subprojects/perfetto ; mkdir -p subprojects/perfetto && curl --fail --location https://github.com/google/perfetto/archive/$(grep 'revision =' subprojects/perfetto.wrap | cut -d ' ' -f3).tar.gz | tar zxf - --strip-components=1 -C subprojects/perfetto
+    - rm -rf subprojects/perfetto ; mkdir -p subprojects/perfetto && curl --fail https://android.googlesource.com/platform/external/perfetto/+archive/$(grep 'revision =' subprojects/perfetto.wrap | cut -d ' ' -f3).tar.gz | tar zxf - -C subprojects/perfetto
     # compress the current folder
     - tar -cvzf ../$CI_PROJECT_NAME.tar.gz .
 
@@ -44,7 +44,6 @@ debian-x86_64:
       -D spirv-to-dxil=true
       -D tools=drm-shim
       -D valgrind=disabled
-      -D perfetto=true
     S3_ARTIFACT_NAME: mesa-x86_64-default-${BUILDTYPE}
     RUN_MESON_TESTS: "false"  # debian-build-x86_64 already runs these
   artifacts:
@@ -58,7 +57,10 @@ debian-x86_64-asan:
     - .build-run-long
   variables:
     VULKAN_DRIVERS: "swrast,amd,intel"
-    GALLIUM_DRIVERS: "llvmpipe,softpipe,zink,r300"
+    GALLIUM_DRIVERS: "llvmpipe,softpipe,zink"
+    C_ARGS: >
+      -Wno-error=stringop-truncation
+      -Wno-error=deprecated-declarations
     EXTRA_OPTION: >
       -D intel-elk=false
       -D intel-rt=false
@@ -119,6 +121,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
@@ -143,6 +146,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: >
@@ -184,9 +193,9 @@ 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"
+    GALLIUM_DRIVERS: "i915,iris,nouveau,r300,r600,freedreno,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus"
     VULKAN_DRIVERS: "intel_hasvk,imagination,microsoft-experimental,nouveau,swrast"
     BUILDTYPE: "debugoptimized"
     EXTRA_OPTION: >
@@ -203,6 +212,7 @@ debian-release:
   variables:
     UNWIND: "enabled"
     C_ARGS: >
+      -Wno-error=stringop-overread
       -Wno-error=deprecated-declarations
     CPP_ARGS: >
       -Wno-error=deprecated-declarations
@@ -241,6 +251,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
@@ -276,10 +288,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
@@ -322,8 +338,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
@@ -340,8 +361,6 @@ debian-android:
       -D android-libbacktrace=disabled
       -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
@@ -371,7 +390,7 @@ debian-android:
     - git clean -dxf .
     # aarch64 build:
     - export CROSS=aarch64-linux-android
-    - export GALLIUM_DRIVERS=etnaviv,freedreno,lima,panfrost,vc4,v3d,zink
+    - export GALLIUM_DRIVERS=etnaviv,freedreno,lima,panfrost,vc4,v3d
     - export VULKAN_DRIVERS=freedreno,broadcom,panfrost,virtio
     - export S3_ARTIFACT_NAME=mesa-arm64-android-${BUILDTYPE}
     - !reference [.meson-build-for-tests, script]
@@ -461,8 +480,12 @@ 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"
+    VULKAN_DRIVERS: "broadcom,freedreno,panfrost"
     DRI_LOADERS:
       -D glvnd=disabled
     EXTRA_OPTION: >
@@ -470,10 +493,8 @@ debian-arm64:
       -D imagination-srv=true
       -D freedreno-kmds=msm,virtio
       -D teflon=true
-      -D perfetto=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}
 
@@ -483,8 +504,10 @@ debian-arm64-asan:
     - .meson-build-for-tests
     - .build-run-long
   variables:
-    VULKAN_DRIVERS: "broadcom,freedreno,panfrost"
+    VULKAN_DRIVERS: "broadcom,freedreno"
-    GALLIUM_DRIVERS: "freedreno,vc4,v3d,panfrost"
+    GALLIUM_DRIVERS: "freedreno,vc4,v3d"
+    C_ARGS: >
+      -Wno-error=deprecated-declarations
     DRI_LOADERS:
       -D glvnd=disabled
     EXTRA_OPTION: >
@@ -506,6 +529,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: >
@@ -535,6 +564,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'
@@ -547,13 +580,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:
@@ -675,10 +710,9 @@ debian-vulkan:
       -D c_args=-fno-sanitize-recover=all
       -D cpp_args=-fno-sanitize-recover=all
     UBSAN_OPTIONS: "print_stacktrace=1"
-    VULKAN_DRIVERS: amd,asahi,broadcom,freedreno,intel,intel_hasvk,panfrost,virtio,imagination,microsoft-experimental,nouveau,kosmickrisp
+    VULKAN_DRIVERS: amd,asahi,broadcom,freedreno,intel,intel_hasvk,panfrost,virtio,imagination,microsoft-experimental,nouveau
     EXTRA_OPTION: >
       -D vulkan-layers=device-select,overlay
-      -D tools=drm-shim
       -D build-radv-tests=true
       -D build-aco-tests=true
       -D intel-rt=disabled
@@ -717,26 +751,10 @@ debian-x86_32:
       -D mesa-clc=enabled
       -D install-mesa-clc=true
 
-# In case of issues with this job, contact @frankbinns
-debian-riscv64:
-  extends:
-    - .meson-cross
-    - .use-debian/riscv64_build
-    - .meson-build-only
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64_KVM
-  variables:
-    BUILDTYPE: debug
-    CROSS: riscv64
-    GALLIUM_DRIVERS: "llvmpipe,zink"
-    VULKAN_DRIVERS: "swrast"
-    # See https://gitlab.freedesktop.org/mesa/mesa/-/issues/14123
-    MESON_TEST_ARGS: "--no-suite mesa:llvmpipe"
-
 # While s390 is dead, s390x is very much alive, and one of the last major
 # big-endian platforms, so it provides useful coverage.
 # In case of issues with this job, contact @ajax
-.debian-s390x:
+debian-s390x:
   extends:
     - .meson-cross
     - .use-debian/s390x_build
@@ -751,7 +769,7 @@ debian-riscv64:
     DRI_LOADERS:
       -D glvnd=disabled
 
-.debian-ppc64el:
+debian-ppc64el:
   extends:
     - .meson-cross
     - .use-debian/ppc64el_build

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

@@ -36,6 +36,8 @@
 
     # Keep the job script in the artifacts
     CI_TRON_JOB_SCRIPT_PATH: results/job_script.sh
+  needs:
+    - !reference [.required-for-hardware-jobs, needs]
   tags:
     - farm:$RUNNER_FARM_LOCATION
     - ci-tron:priority:$CI_TRON_JOB_PRIORITY
@@ -95,6 +97,7 @@
       optional: true
     - job: debian-x86_64
       artifacts: false
+    - !reference [.ci-tron-test, needs]
 
 .ci-tron-x86_64-test-vk-manual:
   extends:
@@ -108,17 +111,7 @@
       optional: true
     - job: debian-build-x86_64
       artifacts: false
-
+    - !reference [.ci-tron-test, needs]
-.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:
@@ -130,6 +123,7 @@
       optional: true
     - job: debian-x86_64
       artifacts: false
+    - !reference [.ci-tron-test, needs]
 
 .ci-tron-x86_64-test-gl-manual:
   extends:
@@ -143,20 +137,7 @@
       optional: true
     - job: debian-build-x86_64
       artifacts: false
-
+    - !reference [.ci-tron-test, needs]
-.ci-tron-x86_64-test-gl-asan-manual:
-  extends:
-    - .use-debian/x86_64_test-gl
-    - .ci-tron-x86_64-test
-  variables:
-    S3_ARTIFACT_NAME: "mesa-x86_64-asan-debugoptimized"
-    DEQP_FORCE_ASAN: 1
-  needs:
-    - job: debian/x86_64_test-gl
-      artifacts: false
-      optional: true
-    - job: debian-x86_64-asan
-      artifacts: false
 
 .ci-tron-arm64-test:
   extends:
@@ -176,6 +157,7 @@
       optional: true
     - job: debian-arm64
       artifacts: false
+    - !reference [.ci-tron-test, needs]
 
 .ci-tron-arm64-test-asan-vk:
   extends:
@@ -190,6 +172,7 @@
       optional: true
     - job: debian-arm64-asan
       artifacts: false
+    - !reference [.ci-tron-test, needs]
 
 .ci-tron-arm64-test-ubsan-vk:
   extends:
@@ -203,6 +186,7 @@
       optional: true
     - job: debian-arm64-ubsan
       artifacts: false
+    - !reference [.ci-tron-test, needs]
 
 .ci-tron-arm64-test-gl:
   extends:
@@ -214,6 +198,7 @@
       optional: true
     - job: debian-arm64
       artifacts: false
+    - !reference [.ci-tron-test, needs]
 
 .ci-tron-arm64-test-asan-gl:
   extends:
@@ -228,6 +213,7 @@
       optional: true
     - job: debian-arm64-asan
       artifacts: false
+    - !reference [.ci-tron-test, needs]
 
 .ci-tron-arm64-test-ubsan-gl:
   extends:
@@ -241,6 +227,7 @@
       optional: true
     - job: debian-arm64-ubsan
       artifacts: false
+    - !reference [.ci-tron-test, needs]
 
 .ci-tron-arm32-test:
   extends:
@@ -260,6 +247,7 @@
       optional: true
     - job: debian-arm32
       artifacts: false
+    - !reference [.ci-tron-test, needs]
 
 .ci-tron-arm32-test-gl:
   extends:
@@ -271,6 +259,7 @@
       optional: true
     - job: debian-arm32
       artifacts: false
+    - !reference [.ci-tron-test, needs]
 
 .ci-tron-arm32-test-asan-gl:
   extends:
@@ -285,3 +274,4 @@
       optional: true
     - job: debian-arm32-asan
       artifacts: false
+    - !reference [.ci-tron-test, needs]

.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,7 +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 "$@" &
+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: 363c33efa7f381a9be0d4c6af2dfaa1d
+  CONDITIONAL_BUILD_ANDROID_CTS_TAG: b018634d732f438027ec58c0383615e7
-  CONDITIONAL_BUILD_ANGLE_TAG: e40de41a79653aa19fac70dc6289d8e9
+  CONDITIONAL_BUILD_ANGLE_TAG: ccde6a2b0d3509c2a8fc459cbd936ac4
-  CONDITIONAL_BUILD_CROSVM_TAG: 7edabf28bbd50e00558e3b0bb2d94255
+  CONDITIONAL_BUILD_CROSVM_TAG: 4079babd375b09761d59eacb25a0598a
   CONDITIONAL_BUILD_FLUSTER_TAG: e13f8521875ebd70e207ec0f6f3d3e5b
-  CONDITIONAL_BUILD_PIGLIT_TAG: 7c554632e450496da9382764f449abae
+  CONDITIONAL_BUILD_PIGLIT_TAG: e31960eaf7d80a9e8cdd7869fbcef7f7
-  CONDITIONAL_BUILD_VKD3D_PROTON_TAG: f9a108eea5cca9a5c79b058963e161a8
+  CONDITIONAL_BUILD_VKD3D_PROTON_TAG: 167feb963fb512795aeddc9d1588bc7c
-  CONDITIONAL_BUILD_WINE_TAG: c97d0ebc9d033b3ad8a50c5832955d9c

.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,12 +26,13 @@ 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}_r3"
+ANDROID_CTS_VERSION="${ANDROID_VERSION}_r1"
 ANDROID_CTS_DEVICE_ARCH="x86"
 
 # Download the stripped CTS from S3, because the CTS download from Google can take 20 minutes

.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="5e591d03650dd427001e355f4884b857cadab113"
+ANGLE_REV="8ed16003f27125f27cbb87578368e447043420d3"
 DEPOT_REV="5982a1aeb33dc36382ed8c62eddf52a6135e7dd3"
 
 # Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined
@@ -129,25 +129,8 @@ 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/+/39d42026/config/compiler/BUILD.gn#619
-# https://chromium.googlesource.com/chromium/src/build/+/42209031/config/sanitizers/sanitizers.gni#548
-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.

.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

@@ -16,18 +16,18 @@ section_start crosvm "Building crosvm"
 git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
 
-CROSVM_VERSION=f58c8e685f3f21d733861a080a0857acafd0da56
+CROSVM_VERSION=4a6b4316155742fbfa1be7087c2ee578cfee884d
 git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /platform/crosvm
 pushd /platform/crosvm
 git checkout "$CROSVM_VERSION"
 git submodule update --init
 
-VIRGLRENDERER_VERSION=37168812546aba59e79eb032d65e150c38ad3996
+VIRGLRENDERER_VERSION=06d43ce974b664f9dc521b706a0ad7f91dbf2866
 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

@@ -3,13 +3,14 @@
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
+# DEBIAN_TEST_ANDROID_TAG
 # DEBIAN_TEST_BASE_TAG
 
 set -uex
 
 section_start deqp-runner "Building deqp-runner"
 
-DEQP_RUNNER_VERSION=0.23.2
+DEQP_RUNNER_VERSION=0.20.3
 
 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_MAIN_COMMIT=db48c34bebaf3359453e44ab151a2ff9f9c58eb2
-DEQP_VK_VERSION=1.4.4.2
+DEQP_VK_VERSION=1.4.3.3
-DEQP_GL_VERSION=4.6.8.0
+DEQP_GL_VERSION=4.6.6.0
-DEQP_GLES_VERSION=3.2.14.0
+DEQP_GLES_VERSION=3.2.12.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,39 +46,37 @@ main_cts_patch_files=(
 
 # shellcheck disable=SC2034
 vk_cts_commits_to_backport=(
-  # 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-vk_Wait-for-sparse-memory-binds-to-finish-in-host-image.patch
 )
 
 # shellcheck disable=SC2034
 gl_cts_commits_to_backport=(
+  # Add testing for GL_PRIMITIVES_SUBMITTED_ARB query.
+  e075ce73ddc5973aa46a5236c715bb281c9501fa
 )
 
 # 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
+  build-deqp-gl_Revert-Add-missing-context-deletion.patch
+  build-deqp-gl_Revert-Fix-issues-with-GLX-reset-notification-strate.patch
+  build-deqp-gl_Revert-Fix-spurious-failures-when-using-a-config-wit.patch
 )
 
 # shellcheck disable=SC2034
 # GLES builds also EGL
 gles_cts_commits_to_backport=(
-  # 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
+  build-deqp-gl_Revert-Add-missing-context-deletion.patch
+  build-deqp-gl_Revert-Fix-issues-with-GLX-reset-notification-strate.patch
+  build-deqp-gl_Revert-Fix-spurious-failures-when-using-a-config-wit.patch
 )
 
 
@@ -109,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
+  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=$(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
-
   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.8.2
-
-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-perfetto.sh

@@ -1,77 +0,0 @@
-#!/usr/bin/env bash
-
-set -uex
-
-section_start perfetto "Building perfetto"
-
-BASE_PWD=$PWD
-
-PERFETTO_REVISION=$(grep 'revision =' subprojects/perfetto.wrap | cut -d ' ' -f3)
-
-patch_files=(
-  "build-perfetto-Fix-C-standard-library-build-errors-with-Debian-13.patch"
-)
-
-# Set PERFETTO_ARCH based on DEBIAN_ARCH
-if [[ -z "${PERFETTO_ARCH:-}" ]]; then
-  case "$DEBIAN_ARCH" in
-    amd64) PERFETTO_ARCH=x64;;
-    arm64) PERFETTO_ARCH=arm64;;
-  esac
-fi
-
-git clone --branch "$PERFETTO_REVISION" --depth 1 https://github.com/google/perfetto /perfetto
-
-pushd /perfetto
-
-for patch in "${patch_files[@]}"; do
-  echo "Applying patch: $patch"
-  git am "$BASE_PWD/.gitlab-ci/container/patches/$patch"
-done
-
-# Base GN args
-mkdir -p _build
-cat >_build/args.gn <<EOF
-is_debug=false
-target_cpu="${PERFETTO_ARCH}"
-target_os="${PERFETTO_TARGET}"
-EOF
-
-case "$PERFETTO_TARGET" in
-linux)
-        # Override Perfetto’s default toolchain selection here, as the bundled
-        # arm64 toolchain is an x86-64 -> arm64 cross-compiler.
-        cat >>_build/args.gn <<EOF
-is_system_compiler = true
-is_hermetic_clang = false
-ar = "ar"
-cc = "clang-${LLVM_VERSION}"
-cxx = "clang++-${LLVM_VERSION}"
-extra_ldflags = "-fuse-ld=lld-${LLVM_VERSION} -lpthread -ldl"
-EOF
-        ./tools/install-build-deps
-        ;;
-android)
-        # No additional args needed when cross-building for Android
-        ./tools/install-build-deps --android
-        ;;
-*)
-        echo "Unexpected PERFETTO_TARGET value: $PERFETTO_TARGET"
-        exit 1
-        ;;
-esac
-
-./tools/gn gen _build/
-./tools/ninja -C _build/ tracebox
-
-mkdir -p build
-cp _build/tracebox build/
-
-"${STRIP_CMD:-strip}" build/tracebox || true
-
-# Cleanup everything except build/
-find . -mindepth 1 -maxdepth 1 ! -name build -exec rm -rf {} +
-
-popd
-
-section_end perfetto

.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="11ce9eb56edb00e6a7702d13168cc827ce5e0cbd"
+REV="4147e9d7aeb8ba26ffc25a90fc237588bcb3bb11"
 
 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit

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

@@ -12,7 +12,11 @@ section_start rust "Building Rust toolchain"
 # DEBIAN_BUILD_BASE_TAG
 # DEBIAN_TEST_BASE_TAG
 
-MINIMUM_SUPPORTED_RUST_VERSION=$(python3 -c 'import tomllib; print(tomllib.load(open("clippy.toml", "rb"))["msrv"])')
+# This version number should match what we require in meson.build so we catch
+# build issues from patches relying on new features in newer Rust versions.
+# Keep this is sync with the `rustc.version()` check in meson.build, and with
+# the `rustup default` line in .gitlab-ci/meson/build.sh
+MINIMUM_SUPPORTED_RUST_VERSION=1.82.0
 
 # This version number can be bumped freely, to benefit from the latest
 # diagnostics in CI `build-only` jobs, and for building external CI
@@ -35,7 +39,7 @@ curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
 
 if [ "$1" = "build" ]
 then
-  rustup toolchain install --profile minimal --component clippy,rustfmt "$MINIMUM_SUPPORTED_RUST_VERSION"
+  rustup toolchain install --profile minimal --component clippy,rustfmt $MINIMUM_SUPPORTED_RUST_VERSION
 fi
 
 find "$HOME"/.rustup/toolchains/*/lib -type f -name "*.so" -exec strip {} \;

.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="9f89a765ba3f10c715395c087b664a81947bb816"
+VKD3D_PROTON_COMMIT="0845d1b69c6b474debe39d25f0137bf108a42b92"
 
 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 checkout "$VKD3D_PROTON_COMMIT"
-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 submodule update --init --recursive
+git submodule update --recursive
 
-meson setup build --buildtype release -D enable_tests=true \
+meson setup                                           \
-      -D c_args=-Wno-error=incompatible-pointer-types
+      -D c_args=-Wno-error=incompatible-pointer-types \
-# Build and install specifically the bits we want; gets rid of 24MB of
+      -D enable_tests=true                            \
-# unwanted files, keeping only 7.6MB of the three useful files.
+      --buildtype release                             \
-for file in \
+      --prefix "$VKD3D_PROTON_DST_DIR"                \
-  libs/d3d12/libvkd3d-proton-d3d12.so \
+      --strip                                         \
-  libs/d3d12core/libvkd3d-proton-d3d12core.so \
+      --libdir "lib"                                  \
-  tests/d3d12 \
+      "$VKD3D_PROTON_BUILD_DIR/build"
-; do
-  ninja -C build "$file"
-  strip build/"$file"
-  install -Dm755 -t "${VKD3D_PROTON_DST_DIR}/$(dirname "$file")" build/"$file"
-done
 
-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="8474616c3095756c52c1b810b21bd1366b3fc909"
+VALIDATION_TAG="f7a6d134b827a17a1c75a5e04fbf04e97d5d9388"
 
 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,141 +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
-
-# 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 \
-    /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/create-cross-file.sh

@@ -22,8 +22,6 @@ elif [[ "$arch" = "i386" ]]; then
     rust_target=i686-unknown-linux-gnu
 elif [[ "$arch" = "ppc64el" ]]; then
     rust_target=powerpc64le-unknown-linux-gnu
-elif [[ "$arch" = "riscv64" ]]; then
-    rust_target=riscv64gc-unknown-linux-gnu
 elif [[ "$arch" = "s390x" ]]; then
     rust_target=s390x-unknown-linux-gnu
 else

.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

@@ -69,7 +69,6 @@ DEPS=(
     libxshmfence-dev
     libxtensor-dev
     libxxf86vm-dev
-    libwayland-bin
     libwayland-dev
     libwayland-egl-backend-dev
     "llvm-${LLVM_VERSION}-dev"
@@ -85,7 +84,6 @@ DEPS=(
     python3-venv
     shellcheck
     u-boot-tools
-    wayland-protocols
     xz-utils
     yamllint
     zlib1g-dev
@@ -111,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

@@ -121,30 +121,6 @@ debian/ppc64el_build:
     - job: debian/ppc64el_build
       optional: true
 
-# Debian based RISC-V 64 cross-build image
-debian/riscv64_build:
-  extends:
-    - .use-debian/x86_64_build-base
-  variables:
-    MESA_IMAGE_TAG: &debian-riscv64_build ${DEBIAN_BUILD_TAG}
-    LLVM_VERSION: &debian-riscv64-llvm 19
-
-.use-debian/riscv64_build:
-  tags:
-    - $FDO_RUNNER_JOB_PRIORITY_TAG_X86_64
-  extends:
-    - .set-image-base-tag
-  variables:
-    MESA_BASE_TAG: *debian-x86_64_build-base
-    MESA_IMAGE_PATH: "debian/riscv64_build"
-    MESA_IMAGE_TAG: *debian-riscv64_build
-    LLVM_VERSION: *debian-riscv64-llvm
-  needs:
-    - job: sanity
-      optional: true
-    - job: debian/riscv64_build
-      optional: true
-
 # Debian based s390x cross-build image
 debian/s390x_build:
   extends:
@@ -169,25 +145,25 @@ debian/s390x_build:
     - job: debian/s390x_build
       optional: true
 
-# Common Android variables
+# Android NDK cross-build image
 .android-variables:
   variables:
-    ANDROID_VERSION: 16
+    ANDROID_VERSION: 14
-    # Bump both DEBIAN_BUILD_TAG and DEBIAN_TEST_ANDROID_TAG when updating
+    ANDROID_NDK_VERSION: "r27c"
-    # NDK and SDK versions.
+    ANDROID_SDK_VERSION: 34
-    ANDROID_NDK_VERSION: "r29"
-    ANDROID_SDK_VERSION: 35  # Android 16 would be 36, but NDK only supports up to 35
     ANDROID_LLVM_VERSION: llvmorg-19.1.7
     ANDROID_LLVM_ARTIFACT_NAME: android-x86_64-llvm-20250822
     # This can be confusing: LLVM_VERSION refers to the host LLVM toolchain
     # used (LLVM 19 in our Debian system), but ANDROID_LLVM_VERSION refers to
     # the cross-compiling LLVM toolchain used to build for the Android system.
     LLVM_VERSION: &debian-android-llvm 19
-    CUTTLEFISH_PROJECT_PATH: gfx-ci/android/aosp-manifest
+    CUTTLEFISH_PROJECT_PATH: ao2/aosp-manifest
     CUTTLEFISH_BUILD_VERSION_TAGS: mesa-venus
-    CUTTLEFISH_BUILD_NUMBER: 20260427.001
+    CUTTLEFISH_BUILD_NUMBER: 20250701.001
+    AOSP_KERNEL_PROJECT_PATH: ao2/aosp-kernel-manifest
+    AOSP_KERNEL_BUILD_VERSION_TAGS: common-android14-6.1-venus
+    AOSP_KERNEL_BUILD_NUMBER: 20241107.001
 
-# Android NDK cross-build image
 debian/android_build:
   extends:
     - .android-variables
@@ -527,51 +503,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/riscv64_build.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-. .gitlab-ci/setup-test-env.sh
-
-arch=riscv64
-
-# Ephemeral packages (installed for this script and removed again at the end)
-EPHEMERAL=(
-    libssl-dev
-)
-
-apt-get -y install "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/build-mold.sh
-
-apt-get purge -y "${EPHEMERAL[@]}"
-
-. .gitlab-ci/container/cross_build.sh

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

@@ -1,250 +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=()
-fi
-
-if "${TEST_CONTAINER}"; then
-  # We only need the Cuttlefish runtime dependencies in test containers
-  DEPS=(
-      aapt
-      cuttlefish-base
-      cuttlefish-user
-      iproute2
-  )
-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
-
-# We currently only have x86_64 CTS jobs
-if [ "${ANDROID_ARCH}" = "x86_64" ]; 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
-
-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
 
@@ -77,6 +77,28 @@ apt-get install -y --no-remove --no-install-recommends \
 
 section_end debian_setup
 
+############### Build piglit replayer
+
+if [ "$DEBIAN_ARCH" != "armhf" ]; then
+  # We don't run any _piglit_ Vulkan tests in the containers.
+  PIGLIT_OPTS="-DPIGLIT_USE_WAFFLE=ON
+              -DPIGLIT_USE_GBM=OFF
+              -DPIGLIT_USE_WAYLAND=OFF
+              -DPIGLIT_USE_X11=OFF
+              -DPIGLIT_BUILD_GLX_TESTS=OFF
+              -DPIGLIT_BUILD_EGL_TESTS=OFF
+              -DPIGLIT_BUILD_WGL_TESTS=OFF
+              -DPIGLIT_BUILD_GL_TESTS=OFF
+              -DPIGLIT_BUILD_GLES1_TESTS=OFF
+              -DPIGLIT_BUILD_GLES2_TESTS=OFF
+              -DPIGLIT_BUILD_GLES3_TESTS=OFF
+              -DPIGLIT_BUILD_CL_TESTS=OFF
+              -DPIGLIT_BUILD_VK_TESTS=OFF
+              -DPIGLIT_BUILD_DMA_BUF_TESTS=OFF" \
+  PIGLIT_BUILD_TARGETS="piglit_replayer" \
+  . .gitlab-ci/container/build-piglit.sh
+fi
+
 ############### Build dEQP VK
 
 DEQP_API=tools \
@@ -108,23 +130,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

@@ -45,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
@@ -55,7 +52,6 @@ DEPS=(
     spirv-tools
     strace
     time
-    wayland-protocols
     zstd
 )
 
@@ -80,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,164 @@
 #!/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 \
+set -e
-BUILD_CONTAINER=true \
+
-TEST_CONTAINER=true \
+. .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
+    sudo
+    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_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_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
+
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+  -O "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${AOSP_KERNEL_PROJECT_PATH}/aosp-kernel-common-${AOSP_KERNEL_BUILD_VERSION_TAGS}.${AOSP_KERNEL_BUILD_NUMBER}/bzImage"
+curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
+  -O "https://${S3_HOST}/${S3_ANDROID_BUCKET}/${AOSP_KERNEL_PROJECT_PATH}/aosp-kernel-common-${AOSP_KERNEL_BUILD_VERSION_TAGS}.${AOSP_KERNEL_BUILD_NUMBER}/initramfs.img"
+
+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:?}"
+
+export SUDO_FORCE_REMOVE=yes
+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,12 +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}/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-android-Implement-headless-WSI-fallback-using-AImageR.patch

@@ -1,277 +0,0 @@
-From 0ce7ca82289ec3351ccec4b37540d8fdbc8dd095 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.
-- Adds ImageReaderNativeWindow (EGL) and ImageReaderVulkanWindow (Vulkan)
-  to manage the AImageReader lifecycle within the framework.
-- 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.
-- 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   | 159 +++++++++++++++++-
- targets/android/android.cmake                 |   5 +
- 3 files changed, 164 insertions(+), 7 deletions(-)
-
-diff --git a/external/openglcts/README.md b/external/openglcts/README.md
-index 69eb8a5c1e..f464291858 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..86984202fb 100644
---- a/framework/platform/android/tcuAndroidPlatform.cpp
-+++ b/framework/platform/android/tcuAndroidPlatform.cpp
-@@ -35,6 +35,12 @@
- 
- // Assume no call translation is needed
- #include <android/native_window.h>
-+#if DE_ANDROID_API >= 24
-+#include <media/NdkImageReader.h>
-+#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 +142,81 @@ private:
-     WindowRegistry &m_windowRegistry;
- };
- 
-+#if DE_ANDROID_API >= 24
-+static ANativeWindow *acquireImageReaderWindow(int width, int height, int32_t format, AImageReader **outReader)
-+{
-+    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, 2, &reader);
-+#else
-+    media_status_t status = AImageReader_new(width, height, format, 2, &reader);
-+#endif
-+    if (status != AMEDIA_OK || !reader)
-+        throw ResourceError("Failed to create AImageReader", nullptr, __FILE__, __LINE__);
-+
-+    ANativeWindow *nativeWindow = nullptr;
-+    status                      = AImageReader_getWindow(reader, &nativeWindow);
-+    if (status != AMEDIA_OK || !nativeWindow)
-+    {
-+        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, ANativeWindow *window, int width, int height)
-+        : eglu::NativeWindow(WINDOW_CAPABILITIES)
-+        , m_reader(reader)
-+        , m_window(window)
-+        , m_size(width, height)
-+    {
-+    }
-+
-+    virtual ~ImageReaderNativeWindow(void)
-+    {
-+        if (m_reader)
-+            AImageReader_delete(m_reader);
-+    }
-+
-+    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;
-+    ANativeWindow *m_window;
-+    tcu::IVec2 m_size;
-+};
-+#endif
-+
- // NativeWindow
- 
- NativeWindow::NativeWindow(Window *window, int width, int height, int32_t format)
-@@ -197,10 +278,29 @@ 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;
-+        // 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);
-+
-+        return new ImageReaderNativeWindow(reader, nativeWindow, width, height);
-+#else
-+        throw ResourceError("Native window is not available", nullptr, __FILE__, __LINE__);
-+#endif
-+    }
- }
- 
- // NativeDisplayFactory
-@@ -279,6 +379,43 @@ private:
-     tcu::Android::Window &m_window;
- };
- 
-+#if DE_ANDROID_API >= 24
-+class ImageReaderVulkanWindow : public vk::wsi::AndroidWindowInterface
-+{
-+public:
-+    ImageReaderVulkanWindow(AImageReader *reader, ANativeWindow *window)
-+        : vk::wsi::AndroidWindowInterface(vk::pt::AndroidNativeWindowPtr(window))
-+        , m_reader(reader)
-+    {
-+    }
-+
-+    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)
-+            AImageReader_delete(m_reader);
-+    }
-+
-+private:
-+    AImageReader *m_reader;
-+};
-+#endif
-+
- class VulkanDisplay : public vk::wsi::Display
- {
- public:
-@@ -306,7 +443,21 @@ 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;
-+            ANativeWindow *nativeWindow = acquireImageReaderWindow(width, height, AIMAGE_FORMAT_RGBA_8888, &reader);
-+
-+            return new ImageReaderVulkanWindow(reader, 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 8a9b46a0fd740679ff576ae70e5ac4bae12ac8b0 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 -
+ framework/platform/CMakeLists.txt             |   9 --
- .../platform/android/tcuAndroidPlatform.cpp   | 177 +-----------------
+ .../platform/android/tcuAndroidPlatform.cpp   | 126 +-----------------
  .../platform/android/tcuAndroidPlatform.hpp   |  14 +-
  framework/platform/lnx/tcuLnxPlatform.cpp     |   9 +-
- .../surfaceless/tcuSurfacelessPlatform.cpp    |  54 ------
+ .../surfaceless/tcuSurfacelessPlatform.cpp    |  54 --------
- 5 files changed, 3 insertions(+), 260 deletions(-)
+ 5 files changed, 3 insertions(+), 209 deletions(-)
 
 diff --git a/framework/platform/CMakeLists.txt b/framework/platform/CMakeLists.txt
-index 64d248b30f..833df5a08a 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 64d248b30f..833df5a08a 100644
  		)
  
  		include_directories(lnx)
-@@ -168,8 +164,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 64d248b30f..833df5a08a 100644
  			osx/tcuOSXMetalView.mm
  			osx/tcuOSXMetalView.hpp
  			)
-@@ -195,9 +189,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 64d248b30f..833df5a08a 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 9b117f50c6..b007c783cf 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 9b117f50c6..b007c783cf 100644
  
  // Assume no call translation is needed
  #include <android/native_window.h>
-@@ -309,153 +308,6 @@ eglu::NativeDisplay *NativeDisplayFactory::createDisplay(const EGLAttrib *attrib
+@@ -217,102 +216,6 @@ eglu::NativeDisplay *NativeDisplayFactory::createDisplay(const EGLAttrib *attrib
      return new NativeDisplay();
  }
  
@@ -132,43 +132,6 @@ index 9b117f50c6..b007c783cf 100644
 -    tcu::Android::Window &m_window;
 -};
 -
--#if DE_ANDROID_API >= 24
--class ImageReaderVulkanWindow : public vk::wsi::AndroidWindowInterface
--{
--public:
--    ImageReaderVulkanWindow(AImageReader *reader, ANativeWindow *window)
--        : vk::wsi::AndroidWindowInterface(vk::pt::AndroidNativeWindowPtr(window))
--        , m_reader(reader)
--    {
--    }
--
--    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)
--            AImageReader_delete(m_reader);
--    }
--
--private:
--    AImageReader *m_reader;
--};
--#endif
--
 -class VulkanDisplay : public vk::wsi::Display
 -{
 -public:
@@ -196,21 +159,7 @@ index 9b117f50c6..b007c783cf 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;
--            ANativeWindow *nativeWindow = acquireImageReaderWindow(width, height, AIMAGE_FORMAT_RGBA_8888, &reader);
--
--            return new ImageReaderVulkanWindow(reader, nativeWindow);
--#else
 -            TCU_THROW(ResourceError, "Native window is not available");
--#endif
--        }
 -    }
 -
 -private:
@@ -220,7 +169,7 @@ index 9b117f50c6..b007c783cf 100644
  static size_t getTotalSystemMemory(ANativeActivity *activity)
  {
      const size_t MiB = (size_t)(1 << 20);
-@@ -484,8 +336,7 @@ static size_t getTotalSystemMemory(ANativeActivity *activity)
+@@ -341,8 +244,7 @@ static size_t getTotalSystemMemory(ANativeActivity *activity)
  // Platform
  
  Platform::Platform(NativeActivity &activity)
@@ -230,7 +179,7 @@ index 9b117f50c6..b007c783cf 100644
  {
      m_nativeDisplayFactoryRegistry.registerFactory(new NativeDisplayFactory(m_windowRegistry));
      m_contextFactoryRegistry.registerFactory(new eglu::GLContextFactory(m_nativeDisplayFactoryRegistry));
-@@ -501,16 +352,6 @@ bool Platform::processEvents(void)
+@@ -358,16 +260,6 @@ bool Platform::processEvents(void)
      return true;
  }
  
@@ -247,7 +196,7 @@ index 9b117f50c6..b007c783cf 100644
  void Platform::getMemoryLimits(tcu::PlatformMemoryLimits &limits) const
  {
      // Worst-case estimates
-@@ -544,22 +385,6 @@ void Platform::getMemoryLimits(tcu::PlatformMemoryLimits &limits) const
+@@ -401,22 +293,6 @@ void Platform::getMemoryLimits(tcu::PlatformMemoryLimits &limits) const
      limits.devicePageTableHierarchyLevels    = 3;
  }
  
@@ -271,7 +220,7 @@ index 9b117f50c6..b007c783cf 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 @@
@@ -318,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 @@
@@ -360,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..c9f044b130 100644
+index 585bfbbae..9f386b3ca 100644
 --- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
 +++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp
 @@ -43,7 +43,6 @@
@@ -439,5 +388,5 @@ index 2224f4164e..c9f044b130 100644
  
  class ContextFactory : public glu::ContextFactory
 -- 
-2.51.0
+2.45.2
 

.gitlab-ci/container/patches/build-deqp-gl_Revert-Add-missing-context-deletion.patch

@@ -0,0 +1,42 @@
+From 067676253ad11846f420087d30021629f3c43382 Mon Sep 17 00:00:00 2001
+From: Valentine Burley <valentine.burley@collabora.com>
+Date: Fri, 11 Apr 2025 16:51:08 +0200
+Subject: Revert "Add missing context deletion"
+
+This reverts commit 195ee2c99d3174e738506cc86828766805c0ede9.
+---
+ .../modules/gles31/es31cComputeShaderTests.cpp        | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/external/openglcts/modules/gles31/es31cComputeShaderTests.cpp b/external/openglcts/modules/gles31/es31cComputeShaderTests.cpp
+index 4c7349e59..ece33929d 100644
+--- a/external/openglcts/modules/gles31/es31cComputeShaderTests.cpp
++++ b/external/openglcts/modules/gles31/es31cComputeShaderTests.cpp
+@@ -721,11 +721,6 @@ class LongRunningComputeFenceTest : public ComputeShaderBase
+         glDeleteProgram(m_program2);
+         glDeleteBuffers(2, &m_buffer);
+ 
+-        // Delete shared context and keep default context set
+-        delete m_sharedContext;
+-        m_sharedContext = NULL;
+-        m_context.getRenderContext().makeCurrent();
+-
+         return NO_ERROR;
+     }
+ };
+@@ -910,12 +905,6 @@ class LongRunningPersistentSSBOComputeTest : public ComputeShaderBase
+     {
+         glDeleteBuffers(2, &m_buffer);
+         m_dataLoadStore = NULL;
+-
+-        // Delete shared context and keep default context set
+-        delete m_sharedContext;
+-        m_sharedContext = NULL;
+-        m_context.getRenderContext().makeCurrent();
+-
+         return NO_ERROR;
+     }
+ };
+-- 
+2.45.2
+

.gitlab-ci/container/patches/build-deqp-gl_Revert-Fix-issues-with-GLX-reset-notification-strate.patch

@@ -0,0 +1,81 @@
+From 6cd7a951f6a50d0f74c798035ac7ce201f2aa6f0 Mon Sep 17 00:00:00 2001
+From: Valentine Burley <valentine.burley@collabora.com>
+Date: Fri, 11 Apr 2025 16:51:03 +0200
+Subject: Revert "Fix issues with GLX reset notification strategy"
+
+This reverts commit 3e6b3fb43eb9682641d8c880429255569a4472c0.
+---
+ .../platform/lnx/X11/tcuLnxX11GlxPlatform.cpp | 23 ++++---------------
+ 1 file changed, 4 insertions(+), 19 deletions(-)
+
+diff --git a/framework/platform/lnx/X11/tcuLnxX11GlxPlatform.cpp b/framework/platform/lnx/X11/tcuLnxX11GlxPlatform.cpp
+index b21e6bcbd..e1d33823c 100644
+--- a/framework/platform/lnx/X11/tcuLnxX11GlxPlatform.cpp
++++ b/framework/platform/lnx/X11/tcuLnxX11GlxPlatform.cpp
+@@ -147,7 +147,6 @@ private:
+     GlxDisplay &m_display;
+     ::Visual *m_visual;
+     const GLXFBConfig m_fbConfig;
+-    glu::ResetNotificationStrategy resetStrategy;
+ };
+ 
+ class GlxDrawable
+@@ -220,7 +219,6 @@ public:
+     virtual const tcu::RenderTarget &getRenderTarget(void) const;
+     virtual glw::GenericFuncType getProcAddress(const char *name) const;
+     const GLXContext &getGLXContext(void) const;
+-    const GlxVisual &getGLXVisual(void) const;
+ 
+ private:
+     GlxDisplay m_glxDisplay;
+@@ -412,31 +410,23 @@ GLXContext GlxVisual::createContext(const GlxContextFactory &factory, const Cont
+         }
+     }
+ 
+-    const GlxRenderContext *sharedGlxRenderContext = dynamic_cast<const GlxRenderContext *>(sharedContext);
+-
+-    /* If there is a shared context, use same reset notification strategy. */
+-    glu::ResetNotificationStrategy usedResetNotificationStrategy =
+-        sharedGlxRenderContext ? sharedGlxRenderContext->getGLXVisual().resetStrategy : resetNotificationStrategy;
+-
+-    if (usedResetNotificationStrategy != glu::RESET_NOTIFICATION_STRATEGY_NOT_SPECIFIED)
++    if (resetNotificationStrategy != glu::RESET_NOTIFICATION_STRATEGY_NOT_SPECIFIED)
+     {
+         checkGlxExtension(m_display, "GLX_ARB_create_context_robustness");
+         attribs.push_back(GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB);
+ 
+-        if (usedResetNotificationStrategy == glu::RESET_NOTIFICATION_STRATEGY_NO_RESET_NOTIFICATION)
++        if (resetNotificationStrategy == glu::RESET_NOTIFICATION_STRATEGY_NO_RESET_NOTIFICATION)
+             attribs.push_back(GLX_NO_RESET_NOTIFICATION_ARB);
+-        else if (usedResetNotificationStrategy == glu::RESET_NOTIFICATION_STRATEGY_LOSE_CONTEXT_ON_RESET)
++        else if (resetNotificationStrategy == glu::RESET_NOTIFICATION_STRATEGY_LOSE_CONTEXT_ON_RESET)
+             attribs.push_back(GLX_LOSE_CONTEXT_ON_RESET_ARB);
+         else
+             TCU_THROW(InternalError, "Unknown reset notification strategy");
+     }
+ 
+-    // Reset notification strategy used with this visual.
+-    resetStrategy = resetNotificationStrategy;
+-
+     // Terminate attrib list
+     attribs.push_back(None);
+ 
++    const GlxRenderContext *sharedGlxRenderContext = dynamic_cast<const GlxRenderContext *>(sharedContext);
+     const GLXContext &sharedGLXContext = sharedGlxRenderContext ? sharedGlxRenderContext->getGLXContext() : nullptr;
+ 
+     return TCU_CHECK_GLX(
+@@ -815,11 +805,6 @@ const GLXContext &GlxRenderContext::getGLXContext(void) const
+     return m_GLXContext;
+ }
+ 
+-const GlxVisual &GlxRenderContext::getGLXVisual(void) const
+-{
+-    return m_glxVisual;
+-}
+-
+ MovePtr<ContextFactory> createContextFactory(EventState &eventState)
+ {
+     return MovePtr<ContextFactory>(new GlxContextFactory(eventState));
+-- 
+2.45.2
+

.gitlab-ci/container/patches/build-deqp-gl_Revert-Fix-spurious-failures-when-using-a-config-wit.patch

@@ -0,0 +1,56 @@
+From b512e6d5a0c79b194293936bd06656646913704e Mon Sep 17 00:00:00 2001
+From: Valentine Burley <valentine.burley@collabora.com>
+Date: Fri, 11 Apr 2025 16:50:57 +0200
+Subject: Revert "Fix spurious failures when using a config without
+ pbuffer support"
+
+This reverts commit 415a0ba8ecde404ef37ce96ece55b46854b44888.
+---
+ external/openglcts/modules/common/glcTestSubcase.cpp | 10 ----------
+ framework/egl/egluGLContextFactory.cpp               |  2 --
+ 2 files changed, 12 deletions(-)
+
+diff --git a/external/openglcts/modules/common/glcTestSubcase.cpp b/external/openglcts/modules/common/glcTestSubcase.cpp
+index 93e58c18a..cd43cc068 100644
+--- a/external/openglcts/modules/common/glcTestSubcase.cpp
++++ b/external/openglcts/modules/common/glcTestSubcase.cpp
+@@ -233,11 +233,6 @@ TestSubcase::IterateResult TestSubcase::iterate(void)
+         if (subError == ERROR)
+             log.writeMessage("Test Setup() failed");
+     }
+-    catch (const tcu::NotSupportedError &ex)
+-    {
+-        log.writeMessage(ex.what());
+-        subError = NOT_SUPPORTED;
+-    }
+     catch (const runtime_error &ex)
+     {
+         log.writeMessage(ex.what());
+@@ -258,11 +253,6 @@ TestSubcase::IterateResult TestSubcase::iterate(void)
+             if (subError == ERROR)
+                 log.writeMessage("Test Run() failed");
+         }
+-        catch (const tcu::NotSupportedError &ex)
+-        {
+-            log.writeMessage(ex.what());
+-            subError = NOT_SUPPORTED;
+-        }
+         catch (const runtime_error &ex)
+         {
+             log.writeMessage(ex.what());
+diff --git a/framework/egl/egluGLContextFactory.cpp b/framework/egl/egluGLContextFactory.cpp
+index 66783ad8b..f347b40ad 100644
+--- a/framework/egl/egluGLContextFactory.cpp
++++ b/framework/egl/egluGLContextFactory.cpp
+@@ -539,8 +539,6 @@ void RenderContext::postIterate(void)
+ 
+     if (m_window)
+     {
+-        EGLU_CHECK_CALL(egl, makeCurrent(m_eglDisplay, m_eglSurface, m_eglSurface, m_eglContext));
+-
+         EGLBoolean swapOk    = egl.swapBuffers(m_eglDisplay, m_eglSurface);
+         EGLint error         = egl.getError();
+         const bool badWindow = error == EGL_BAD_SURFACE || error == EGL_BAD_NATIVE_WINDOW;
+-- 
+2.45.2
+

.gitlab-ci/container/patches/build-deqp-vk_Wait-for-sparse-memory-binds-to-finish-in-host-image.patch

@@ -1,174 +0,0 @@
-From faff9262e1d75a7484ff454c7fffb2b9daf04d0e Mon Sep 17 00:00:00 2001
-From: Ricardo Garcia <rgarcia@igalia.com>
-Date: Wed, 6 May 2026 11:48:13 +0200
-Subject: [PATCH] Wait for sparse memory binds to finish in host image copy
- tests
-
-We add an optional fence to the SparseImage class and use it to wait for
-memory binds to finish before changing image layouts on the host.
-
-Affects:
-dEQP-VK.image.host_image_copy.*
-
-Components: Vulkan
-VK-GL-CTS issue: 6503
-
-Change-Id: I9a4183c464a4cdfc5735a8478d6cd241b8519746
----
- .../vulkancts/framework/vulkan/vkImageUtil.cpp  |  4 ++--
- .../vulkancts/framework/vulkan/vkImageUtil.hpp  |  2 +-
- .../vulkan/image/vktImageHostImageCopyTests.cpp | 15 ++++++++++++---
- .../modules/vulkan/image/vktImageTestsUtil.cpp  |  8 ++++++--
- .../modules/vulkan/image/vktImageTestsUtil.hpp  | 17 +++++++++++++++--
- 5 files changed, 36 insertions(+), 10 deletions(-)
-
-diff --git a/external/vulkancts/framework/vulkan/vkImageUtil.cpp b/external/vulkancts/framework/vulkan/vkImageUtil.cpp
-index f29f62bc30..d52e09cb6f 100644
---- a/external/vulkancts/framework/vulkan/vkImageUtil.cpp
-+++ b/external/vulkancts/framework/vulkan/vkImageUtil.cpp
-@@ -5456,7 +5456,7 @@ void allocateAndBindSparseImage(const DeviceInterface &vk, VkDevice device, cons
-                                 const InstanceInterface &instance, const VkImageCreateInfo &imageCreateInfo,
-                                 const VkSemaphore &signalSemaphore, VkQueue queue, Allocator &allocator,
-                                 std::vector<de::SharedPtr<Allocation>> &allocations, tcu::TextureFormat format,
--                                VkImage destImage)
-+                                VkImage destImage, VkFence fence)
- {
-     const VkImageAspectFlags imageAspectFlags         = getImageAspectFlags(format);
-     const VkPhysicalDeviceProperties deviceProperties = getPhysicalDeviceProperties(instance, physicalDevice);
-@@ -5693,7 +5693,7 @@ void allocateAndBindSparseImage(const DeviceInterface &vk, VkDevice device, cons
-         bindSparseInfo.pImageOpaqueBinds    = &imageMipTailBindInfo;
-     }
- 
--    VK_CHECK(vk.queueBindSparse(queue, 1u, &bindSparseInfo, VK_NULL_HANDLE));
-+    VK_CHECK(vk.queueBindSparse(queue, 1u, &bindSparseInfo, fence));
- }
- 
- bool checkSparseImageFormatSupport(const VkPhysicalDevice physicalDevice, const InstanceInterface &instance,
-diff --git a/external/vulkancts/framework/vulkan/vkImageUtil.hpp b/external/vulkancts/framework/vulkan/vkImageUtil.hpp
-index 1fb9eafcee..94425d222a 100644
---- a/external/vulkancts/framework/vulkan/vkImageUtil.hpp
-+++ b/external/vulkancts/framework/vulkan/vkImageUtil.hpp
-@@ -372,7 +372,7 @@ void allocateAndBindSparseImage(const vk::DeviceInterface &vk, vk::VkDevice devi
-                                 const vk::VkImageCreateInfo &imageCreateInfo, const vk::VkSemaphore &signalSemaphore,
-                                 vk::VkQueue queue, vk::Allocator &allocator,
-                                 std::vector<de::SharedPtr<vk::Allocation>> &allocations, tcu::TextureFormat format,
--                                vk::VkImage destImage);
-+                                vk::VkImage destImage, vk::VkFence fence = VK_NULL_HANDLE);
- #endif // CTS_USES_VULKANSC
- } // namespace vk
- 
-diff --git a/external/vulkancts/modules/vulkan/image/vktImageHostImageCopyTests.cpp b/external/vulkancts/modules/vulkan/image/vktImageHostImageCopyTests.cpp
-index a63adbc2c3..75f610e258 100644
---- a/external/vulkancts/modules/vulkan/image/vktImageHostImageCopyTests.cpp
-+++ b/external/vulkancts/modules/vulkan/image/vktImageHostImageCopyTests.cpp
-@@ -493,16 +493,19 @@ tcu::TestStatus HostImageCopyTestInstance::iterate(void)
-         {
-             createInfo.flags |= (vk::VK_IMAGE_CREATE_SPARSE_BINDING_BIT | vk::VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT);
-             // VUID-VkImageCreateInfo-tiling-04121
--            createInfo.tiling  = vk::VK_IMAGE_TILING_OPTIMAL;
-+            createInfo.tiling = vk::VK_IMAGE_TILING_OPTIMAL;
-+            const auto waitType =
-+                ((m_parameters.action == MEMORY_TO_IMAGE) ? SparseImage::WaitType::SEMAPHORE_AND_FENCE :
-+                                                            SparseImage::WaitType::SEMAPHORE);
-             sparseSampledImage = de::MovePtr<SparseImage>(new SparseImage(vk, device, physicalDevice, vki, createInfo,
-                                                                           m_context.getSparseQueue(), alloc,
--                                                                          mapVkFormat(createInfo.format)));
-+                                                                          mapVkFormat(createInfo.format), waitType));
-             sampledImage       = **sparseSampledImage;
-             if (m_parameters.action == MEMCPY)
-             {
-                 sparseSampledImageCopy = de::MovePtr<SparseImage>(
-                     new SparseImage(vk, device, physicalDevice, vki, createInfo, m_context.getSparseQueue(), alloc,
--                                    mapVkFormat(createInfo.format)));
-+                                    mapVkFormat(createInfo.format), SparseImage::WaitType::SEMAPHORE_AND_FENCE));
-                 sampledImageCopy = **sparseSampledImageCopy;
-             }
-         }
-@@ -757,6 +760,9 @@ tcu::TestStatus HostImageCopyTestInstance::iterate(void)
-     // Load sampled image
-     if (m_parameters.action == MEMORY_TO_IMAGE)
-     {
-+        if (sparseSampledImage && sparseSampledImage->getFence() != VK_NULL_HANDLE)
-+            waitForFence(vk, device, sparseSampledImage->getFence());
-+
-         transitionImageLayout(&cmdBuffer, sampledImage, sampledImageUsage, vk::VK_IMAGE_LAYOUT_UNDEFINED,
-                               m_parameters.dstLayout, sampledSubresourceRange);
-         commandsLog << "vkTransitionImageLayoutEXT() image " << sampledImage << " to layout "
-@@ -905,6 +911,9 @@ tcu::TestStatus HostImageCopyTestInstance::iterate(void)
-                     << "), yOffset (" << region.imageOffset.y << "), width (" << mipImageSize.width << "), height ("
-                     << mipImageSize.height << ")\n";
- 
-+        if (sparseSampledImageCopy && sparseSampledImageCopy->getFence() != VK_NULL_HANDLE)
-+            waitForFence(vk, device, sparseSampledImageCopy->getFence());
-+
-         transitionImageLayout(&cmdBuffer, sampledImageCopy, sampledImageUsage, vk::VK_IMAGE_LAYOUT_UNDEFINED,
-                               m_parameters.dstLayout, sampledSubresourceRange);
- 
-diff --git a/external/vulkancts/modules/vulkan/image/vktImageTestsUtil.cpp b/external/vulkancts/modules/vulkan/image/vktImageTestsUtil.cpp
-index 962dc5f7c0..043047e807 100644
---- a/external/vulkancts/modules/vulkan/image/vktImageTestsUtil.cpp
-+++ b/external/vulkancts/modules/vulkan/image/vktImageTestsUtil.cpp
-@@ -52,14 +52,18 @@ Image::Image(void) : m_allocations(), m_image()
- #ifndef CTS_USES_VULKANSC
- SparseImage::SparseImage(const vk::DeviceInterface &vkd, vk::VkDevice device, vk::VkPhysicalDevice physicalDevice,
-                          const vk::InstanceInterface &vki, const vk::VkImageCreateInfo &createInfo,
--                         const vk::VkQueue sparseQueue, vk::Allocator &allocator, const tcu::TextureFormat &format)
-+                         const vk::VkQueue sparseQueue, vk::Allocator &allocator, const tcu::TextureFormat &format,
-+                         WaitType waitType)
-     : Image()
-     , m_semaphore()
-+    , m_fence()
- {
-     m_image     = createImage(vkd, device, &createInfo);
-     m_semaphore = createSemaphore(vkd, device);
-+    if (waitType == WaitType::SEMAPHORE_AND_FENCE)
-+        m_fence = createFence(vkd, device);
-     allocateAndBindSparseImage(vkd, device, physicalDevice, vki, createInfo, m_semaphore.get(), sparseQueue, allocator,
--                               m_allocations, format, m_image.get());
-+                               m_allocations, format, m_image.get(), *m_fence);
- }
- #endif // CTS_USES_VULKANSC
- 
-diff --git a/external/vulkancts/modules/vulkan/image/vktImageTestsUtil.hpp b/external/vulkancts/modules/vulkan/image/vktImageTestsUtil.hpp
-index 20b0a5a08d..5e2b00eaae 100644
---- a/external/vulkancts/modules/vulkan/image/vktImageTestsUtil.hpp
-+++ b/external/vulkancts/modules/vulkan/image/vktImageTestsUtil.hpp
-@@ -106,20 +106,33 @@ protected:
- class SparseImage : public Image
- {
- public:
-+    enum class WaitType
-+    {
-+        SEMAPHORE = 0,
-+        SEMAPHORE_AND_FENCE
-+    };
-+
-     SparseImage(const vk::DeviceInterface &vkd, vk::VkDevice device, vk::VkPhysicalDevice physicalDevice,
-                 const vk::InstanceInterface &vki, const vk::VkImageCreateInfo &createInfo,
--                const vk::VkQueue sparseQueue, vk::Allocator &allocator, const tcu::TextureFormat &format);
-+                const vk::VkQueue sparseQueue, vk::Allocator &allocator, const tcu::TextureFormat &format,
-+                WaitType waitType = WaitType::SEMAPHORE);
- 
--    virtual vk::VkSemaphore getSemaphore(void) const
-+    vk::VkSemaphore getSemaphore(void) const override
-     {
-         return m_semaphore.get();
-     }
- 
-+    vk::VkFence getFence(void) const
-+    {
-+        return m_fence.get();
-+    }
-+
-     SparseImage(const SparseImage &)            = delete;
-     SparseImage &operator=(const SparseImage &) = delete;
- 
- protected:
-     vk::Move<vk::VkSemaphore> m_semaphore;
-+    vk::Move<vk::VkFence> m_fence;
- };
- #endif // CTS_USES_VULKANSC
- 
--- 
-2.51.0
-

.gitlab-ci/container/patches/build-perfetto-Fix-C-standard-library-build-errors-with-Debian-13.patch

@@ -1,49 +0,0 @@
-From 7a5a9e5be4306637cd3a0ef0f770832f4b4cf4b4 Mon Sep 17 00:00:00 2001
-From: Laura Nao <laura.nao@collabora.com>
-Date: Wed, 12 Nov 2025 14:45:32 +0100
-Subject: [PATCH] Fix C++ standard library build errors with Debian 13
-
-Address missing <algorithm> and <optional> includes that caused build
-failures ("no member named 'find' in namespace 'std'" and
-"error: no template named 'optional' in namespace 'std'") when building
-with the native toolchain on Debian 13.
-
-This was fixed upstream in v48[1] and v49[2] respectively, so this patch
-can be dropped once Perfetto is updated to v48+.
-
-[1] https://github.com/google/perfetto/commit/d005c0123b2f929b918359a53ffe61d7ca2212a0
-[2] https://github.com/google/perfetto/commit/acc24608c84d2d2d8d684f40a110d0a6f4eddc51
-
-Signed-off-by: Laura Nao <laura.nao@collabora.com>
----
- src/profiling/common/producer_support.cc            | 1 +
- src/traced/probes/sys_stats/sys_stats_data_source.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/profiling/common/producer_support.cc b/src/profiling/common/producer_support.cc
-index 5303658..e9e193d 100644
---- a/src/profiling/common/producer_support.cc
-+++ b/src/profiling/common/producer_support.cc
-@@ -16,6 +16,7 @@
- 
- #include "src/profiling/common/producer_support.h"
- 
-+#include <algorithm>
- #include <optional>
- 
- #include "perfetto/ext/base/android_utils.h"
-diff --git a/src/traced/probes/sys_stats/sys_stats_data_source.h b/src/traced/probes/sys_stats/sys_stats_data_source.h
-index e09cd8a..7e4749b 100644
---- a/src/traced/probes/sys_stats/sys_stats_data_source.h
-+++ b/src/traced/probes/sys_stats/sys_stats_data_source.h
-@@ -21,6 +21,7 @@
- 
- #include <map>
- #include <memory>
-+#include <optional>
- #include <string>
- 
- #include "perfetto/ext/base/paged_memory.h"
--- 
-2.39.5
-

.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,21 +58,31 @@ 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 \
+# Venus requires a custom kernel for now
+CUSTOM_KERNEL_ARGS=""
+if [ "$CUTTLEFISH_GPU_MODE" = "venus" ] || [ "$CUTTLEFISH_GPU_MODE" = "venus_guest_angle" ]; then
+  CUSTOM_KERNEL_ARGS="
+  -kernel_path=/cuttlefish/bzImage
+  -initramfs_path=/cuttlefish/initramfs.img
+  "
+fi
+
+HOME=/cuttlefish launch_cvd \
   -daemon \
-  -verbosity=INFO \
+  -verbosity=VERBOSE \
   -file_verbosity=VERBOSE \
+  -use_overlay=false \
   -vsock_guest_cid=$VSOCK_CID \
   -enable_audio=false \
   -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" \
   -cpus=${FDO_CI_CONCURRENT:-4} \
-  -memory_mb ${CUTTLEFISH_MEMORY:-4096}
+  -memory_mb ${CUTTLEFISH_MEMORY:-4096} \
+  $CUSTOM_KERNEL_ARGS
 
 sleep 1
 
@@ -81,7 +91,7 @@ popd
 # download Android Mesa from S3
 curl-with-retry -O "${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ANDROID_ARTIFACT_NAME}.tar.zst"
 mkdir /mesa-android
-tar -C /mesa-android -xf ${S3_ANDROID_ARTIFACT_NAME}.tar.zst
+tar -C /mesa-android -xvf ${S3_ANDROID_ARTIFACT_NAME}.tar.zst
 
 # shellcheck disable=SC2034 # used externally
 INSTALL="/mesa-android/install"

.gitlab-ci/deqp-runner.sh

@@ -39,7 +39,7 @@ if [ -n "${FLUSTER_TAG:-}" ]; then
   export LIBVA_MESSAGING_LEVEL=1
 fi
 
-if [ -n "${PIGLIT_TAG:-}" ]; then
+if [ -n "$PIGLIT_TAG" ]; then
   # Are we using the right Piglit version?
   ci_tag_test_time_check "PIGLIT_TAG"
 elif [ -d "/piglit" ]; then
@@ -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
+add_if_exists() {
-# xfails from multiple possible sources. Do we actually use this, though?
-cat_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
+} | sort -u | while read -r prefix; do
-  cat_if_exists "$prefix" fails
+  add_if_exists "$prefix" fails
-  add_if_exists "--flakes" "$prefix-flakes.txt"
+  add_if_exists "$prefix" flakes
-  add_if_exists "--skips" "$prefix-skips.txt"
+  add_if_exists "$prefix" skips
-  add_if_exists "--single-thread" "$prefix-single-thread.txt"
 done
 
-if [[ $CI_JOB_NAME != *full* ]]; then
+if [ -e "$INSTALL/$GPU_VERSION-slow-skips.txt" ] && [[ $CI_JOB_NAME != *full* ]]; then
-  FILE_ARGS="$FILE_ARGS --skips $INSTALL/all-slow-skips.txt"
+    cat "$INSTALL/$GPU_VERSION-slow-skips.txt" >> /skips.txt
-  add_if_exists "--skips" "$GPU_VERSION-slow-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
+# Remove all but the first 50 individual XML files uploaded as artifacts, to
-# files uploaded as artifacts, to save fd.o space and avoid job log spam
+# save fd.o space when you break everything.
-# 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.
 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

@@ -35,15 +35,13 @@
 #   austriancoder    | ci-tron                          | @austriancoder
 #   collabora        | lava                             | @daniels, @sergi
 #   igalia           | baremetal/poe-powered, ci-tron   | @jasuarez, @chema
-#   imagination      | ci-tron                          | @MTCoster
 #   lima             | lava                             | @enunes
-#   lumag            | ci-tron                          | @lumag
 #   microsoft        | custom                           | @jenatali, @alatiera
 #   ondracka         | ci-tron                          | @ondracka
 #   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:
@@ -294,108 +292,61 @@
     - !reference [.pengutronix-farm-rules, rules]
 
 
-.lumag-farm-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/lumag ]
-      when: never
-    - changes: [ .ci-farms-disabled/lumag ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: on_success
-    - changes: [ .ci-farms-disabled/* ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-
-.lumag-farm-manual-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/lumag ]
-      when: never
-    - changes: [ .ci-farms-disabled/lumag ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - !reference [.lumag-farm-rules, rules]
-
-.imagination-farm-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/imagination ]
-      when: never
-    - changes: [ .ci-farms-disabled/imagination ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: on_success
-    - changes: [ .ci-farms-disabled/* ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-
-.imagination-farm-manual-rules:
-  rules:
-    - exists: [ .ci-farms-disabled/imagination ]
-      when: never
-    - changes: [ .ci-farms-disabled/imagination ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - !reference [.imagination-farm-rules, rules]
-
 # 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
+# Only apply these rules in MR context, because otherwise we get a false
-# on line 23).
+# positive on files being 'created' when pushing to a new branch, and break
-.disable-farm-rules:
+# 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 ]
-      exists: [ .ci-farms-disabled/lumag ]
-      if: '$CI_PIPELINE_SOURCE != "schedule"'
-      when: never
-    - 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,151 +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"
-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"
-
-  # 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/gtest-runner.sh

@@ -0,0 +1,77 @@
+#!/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"
+
+set -ex
+
+INSTALL=$PWD/install
+
+export PATH=/va/bin:$PATH
+
+# Set up the driver environment.
+export LD_LIBRARY_PATH=$INSTALL/lib/
+
+export LIBVA_DRIVERS_PATH=$INSTALL/lib/dri/
+# libva spams driver open info by default, and that happens per testcase.
+export LIBVA_MESSAGING_LEVEL=1
+
+if [ -e "$INSTALL/$GPU_VERSION-fails.txt" ]; then
+    GTEST_RUNNER_OPTIONS="$GTEST_RUNNER_OPTIONS --baseline $INSTALL/$GPU_VERSION-fails.txt"
+fi
+
+# Default to an empty known flakes file if it doesn't exist.
+touch "$INSTALL/$GPU_VERSION-flakes.txt"
+
+if [ -n "$GALLIUM_DRIVER" ] && [ -e "$INSTALL/$GALLIUM_DRIVER-skips.txt" ]; then
+    GTEST_SKIPS="$GTEST_SKIPS --skips $INSTALL/$GALLIUM_DRIVER-skips.txt"
+fi
+
+if [ -n "$DRIVER_NAME" ] && [ -e "$INSTALL/$DRIVER_NAME-skips.txt" ]; then
+    GTEST_SKIPS="$GTEST_SKIPS --skips $INSTALL/$DRIVER_NAME-skips.txt"
+fi
+
+if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then
+    GTEST_SKIPS="$GTEST_SKIPS --skips $INSTALL/$GPU_VERSION-skips.txt"
+fi
+
+set +e
+
+gtest-runner \
+    run \
+    --gtest $GTEST \
+    --output ${RESULTS_DIR} \
+    --jobs ${FDO_CI_CONCURRENT:-4} \
+    $GTEST_SKIPS \
+    --flakes $INSTALL/$GPU_VERSION-flakes.txt \
+    --fraction-start ${CI_NODE_INDEX:-1} \
+    --fraction $((${CI_NODE_TOTAL:-1} * ${GTEST_FRACTION:-1})) \
+    --env "LD_PRELOAD=$TEST_LD_PRELOAD" \
+    $GTEST_RUNNER_OPTIONS
+
+GTEST_EXITCODE=$?
+
+deqp-runner junit \
+   --testsuite gtest \
+   --results $RESULTS_DIR/failures.csv \
+   --output $RESULTS_DIR/junit.xml \
+   --limit 50 \
+   --template "See $ARTIFACTS_BASE_URL/results/{{testcase}}.xml"
+
+# Report the flakes to the IRC channel for monitoring (if configured):
+if [ -n "$FLAKES_CHANNEL" ]; then
+  python3 $INSTALL/report-flakes.py \
+         --host irc.oftc.net \
+         --port 6667 \
+         --results $RESULTS_DIR/results.csv \
+         --known-flakes $INSTALL/$GPU_VERSION-flakes.txt \
+         --channel "$FLAKES_CHANNEL" \
+         --runner "$CI_RUNNER_DESCRIPTION" \
+         --job "$CI_JOB_ID" \
+         --url "$CI_JOB_URL" \
+         --branch "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME:-$CI_COMMIT_BRANCH}" \
+         --branch-title "${CI_MERGE_REQUEST_TITLE:-$CI_COMMIT_TITLE}" || true
+fi
+
+exit $GTEST_EXITCODE

.gitlab-ci/image-tags.yml

@@ -19,27 +19,27 @@ include:
   - .gitlab-ci/conditional-build-image-tags.yml
 
 variables:
-  DEBIAN_BUILD_BASE_TAG: "20250430-imgui.2"
+  DEBIAN_BUILD_BASE_TAG: "20251014-testfix"
-  DEBIAN_BUILD_TAG: "20260430-imgui.2"
+  DEBIAN_BUILD_TAG: "20250926-D3D618"
 
-  DEBIAN_TEST_BASE_TAG: "20260502-virgl"
+  DEBIAN_TEST_BASE_TAG: "20250926-gitlab"
-  DEBIAN_TEST_ANDROID_TAG: "20260507-vkcts"
+  DEBIAN_TEST_ANDROID_TAG: "20251014-vkcts"
-  DEBIAN_TEST_GL_TAG: "20260506-vvl-84"
+  DEBIAN_TEST_GL_TAG: "20251014-vkcts"
-  DEBIAN_TEST_VIDEO_TAG: "20260430-imgui.2"
+  DEBIAN_TEST_VIDEO_TAG: "20250813-vector"
-  DEBIAN_TEST_VK_TAG: "20260507-vkcts"
+  DEBIAN_TEST_VK_TAG: "20251014-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-8a6f"
+  KERNEL_TAG: "v6.16-mesa-9d85"
   KERNEL_REPO: "gfx-ci/linux"
-  PKG_REPO_REV: "e930a803"
+  PKG_REPO_REV: "0d2527f6"
-  FIRMWARE_TAG: "8fc31b97"
+  FIRMWARE_TAG: "36f9bbfa"
   FIRMWARE_REPO: "gfx-ci/firmware"
 
-  WINDOWS_X64_MSVC_TAG: "20251120-bison"
+  WINDOWS_X64_MSVC_TAG: "20250906-d3d10umd"
 
-  WINDOWS_X64_BUILD_TAG: "20260309-D3D619"
+  WINDOWS_X64_BUILD_TAG: "20251001-D3D618"
 
-  WINDOWS_X64_TEST_TAG: "20260309-D3D619"
+  WINDOWS_X64_TEST_TAG: "20250926-D3D618"

.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:20251009-fastboot
   # 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.
@@ -66,6 +66,8 @@ variables:
     - $RUNNER_TAG
   after_script:
     - curl -L --retry 4 -f --retry-connrefused --retry-delay 30 -s "https://${JOB_RESULTS_PATH}" | tar --warning=no-timestamp --zstd -x
+  needs:
+    - !reference [.required-for-hardware-jobs, needs]
 
 .lava-x86_64-test:
   extends:
@@ -87,6 +89,7 @@ variables:
     HWCI_TEST_SCRIPT: install/cuttlefish-runner.sh
     S3_ANDROID_ARTIFACT_NAME: mesa-x86_64-android-debug
   needs:
+    - !reference [.lava-test, needs]
     - job: debian/x86_64_test-android
       artifacts: false
       optional: true
@@ -100,6 +103,7 @@ variables:
     - .use-debian/x86_64_test-gl
     - .lava-x86_64-test
   needs:
+    - !reference [.lava-test, needs]
     - job: debian/x86_64_test-gl
       artifacts: false
       optional: true
@@ -114,6 +118,7 @@ variables:
     DEQP_FORCE_ASAN: 1
     S3_ARTIFACT_NAME: mesa-x86_64-asan-debugoptimized
   needs:
+    - !reference [.lava-test, needs]
     - job: debian/x86_64_test-gl
       artifacts: false
       optional: true
@@ -125,6 +130,7 @@ variables:
     - .use-debian/x86_64_test-video
     - .lava-x86_64-test
   needs:
+    - !reference [.lava-test, needs]
     - job: debian/x86_64_test-video
       artifacts: false
       optional: true
@@ -136,6 +142,7 @@ variables:
     - .use-debian/x86_64_test-vk
     - .lava-x86_64-test
   needs:
+    - !reference [.lava-test, needs]
     - job: debian/x86_64_test-vk
       artifacts: false
       optional: true
@@ -150,6 +157,7 @@ variables:
     DEQP_FORCE_ASAN: 1
     S3_ARTIFACT_NAME: mesa-x86_64-asan-debugoptimized
   needs:
+    - !reference [.lava-test, needs]
     - job: debian/x86_64_test-vk
       artifacts: false
       optional: true
@@ -171,6 +179,7 @@ variables:
     - .use-debian/arm32_test-gl
     - .lava-arm32-test
   needs:
+    - !reference [.lava-test, needs]
     - job: debian/arm32_test-gl
       artifacts: false
       optional: true
@@ -187,29 +196,12 @@ 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
     - .lava-arm64-test
   needs:
+    - !reference [.lava-test, needs]
     - job: debian/arm64_test-gl
       artifacts: false
       optional: true
@@ -224,6 +216,7 @@ variables:
     DEQP_FORCE_ASAN: 1
     S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized
   needs:
+    - !reference [.lava-test, needs]
     - job: debian/arm64_test-gl
       artifacts: false
       optional: true
@@ -235,6 +228,7 @@ variables:
     - .use-debian/arm64_test-vk
     - .lava-arm64-test
   needs:
+    - !reference [.lava-test, needs]
     - job: debian/arm64_test-vk
       artifacts: false
       optional: true
@@ -249,6 +243,7 @@ variables:
     DEQP_FORCE_ASAN: 1
     S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized
   needs:
+    - !reference [.lava-test, needs]
     - job: debian/arm64_test-vk
       artifacts: false
       optional: true

.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
@@ -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
@@ -133,6 +113,16 @@ if [ -n "${S3_ANDROID_ARTIFACT_NAME:-}" ]; then
 		  --path="/cuttlefish"
 		  --format=tar
 		  --compression=zstd
+		- append-overlay
+		  --name=android-kernel
+		  --url="https://${S3_BASE_PATH}/${AOSP_KERNEL_PROJECT_PATH}/aosp-kernel-common-${AOSP_KERNEL_BUILD_VERSION_TAGS}.${AOSP_KERNEL_BUILD_NUMBER}/bzImage"
+		  --path="/cuttlefish"
+		  --format=file
+		- append-overlay
+		  --name=android-initramfs
+		  --url="https://${S3_BASE_PATH}/${AOSP_KERNEL_PROJECT_PATH}/aosp-kernel-common-${AOSP_KERNEL_BUILD_VERSION_TAGS}.${AOSP_KERNEL_BUILD_NUMBER}/initramfs.img"
+		  --path="/cuttlefish"
+		  --format=file
 	)
 fi
 

.gitlab-ci/meson/build.sh

@@ -43,7 +43,9 @@ fi
 
 # Android manages the rust toolchain differently, ignore that case
 if [ "$CI_JOB_STAGE" = "build-for-tests" ] && [[ "$CI_JOB_NAME" != *android* ]]; then
-  rustup default "$(python3 -c 'import tomllib; print(tomllib.load(open("'"$CI_PROJECT_DIR"'/clippy.toml", "rb"))["msrv"])')"
+  # Keep this in sync with the `rustc.version()` check in meson.build, and
+  # MINIMUM_SUPPORTED_RUST_VERSION in .gitlab-ci/container/build-rust.sh
+  rustup default 1.82.0
 fi
 
 # cross-xfail-$CROSS, if it exists, contains a list of tests that are expected

.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 /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

@@ -11,17 +11,11 @@ set -o xtrace
 
 CROSS_FILE=/cross_file-"$CROSS".txt
 
-if [ -d install/bin ]; then
+# Delete unused bin and includes from artifacts to save space.
-  # Keep pps-producer binary for tests that need it.
+rm -rf install/bin install/include
-  # Remove all other binaries to save space.
-  find install/bin -type f -not -name 'pps-producer' -delete
-fi
-
-# Delete unused includes from artifacts to save space.
-rm -rf install/include
 rm -f install/lib/*.a
 
-# Strip the drivers and binaries in the artifacts to cut 80% of the artifacts size.
+# Strip the drivers in the artifacts to cut 80% of the artifacts size.
 if [ -n "$CROSS" ]; then
     STRIP=$(sed -n -E "s/strip\s*=\s*\[?'(.*)'\]?/\1/p" "$CROSS_FILE")
     if [ -z "$STRIP" ]; then
@@ -32,7 +26,7 @@ else
     STRIP="strip"
 fi
 if [ -z "$ARTIFACTS_DEBUG_SYMBOLS" ]; then
-    find install -type f -executable -exec $STRIP --strip-debug {} \;
+    find install -name \*.so -exec $STRIP --strip-debug {} \;
 fi
 
 git_sha=$(git rev-parse --short=10 HEAD)
@@ -46,7 +40,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

@@ -14,7 +14,7 @@ export LD_LIBRARY_PATH=$LIBDIR
 
 cd /usr/local/shader-db
 
-for driver in freedreno lima v3d vc4; do
+for driver in freedreno intel lima v3d vc4; do
     section_start shader-db-${driver} "Running shader-db for $driver"
     env LD_PRELOAD="$LIBDIR/lib${driver}_noop_drm_shim.so" \
         ./run -j"${FDO_CI_CONCURRENT:-4}" ./shaders \
@@ -22,16 +22,6 @@ for driver in freedreno lima v3d vc4; do
     section_end shader-db-${driver}
 done
 
-# Run shader-db over a number of supported platforms for crocus/iris
-for platform in hsw bdw skl mtl lnl ptl; 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}" \
-        ./run -j"${FDO_CI_CONCURRENT:-4}" ./shaders \
-            > "$ARTIFACTSDIR/intel-${platform}-shader-db.txt"
-    section_end "shader-db-intel-${platform}"
-done
-
 # Run shader-db over a number of supported chipsets for nouveau
 for chipset in 40 a3 c0 e4 f0 134 162; do
     section_start shader-db-nouveau-${chipset} "Running shader-db for nouveau - ${chipset}"
@@ -51,13 +41,3 @@ for chipset in 0x5460 0x7140; do
             > "$ARTIFACTSDIR/r300-${chipset}-shader-db.txt"
     section_end shader-db-r300-${chipset}
 done
-
-# Run shader-db for radeonsi
-for device in pitcairn bonaire navi21 navi31 gfx1150 gfx1201; do
-    section_start shader-db-radeonsi-${device} "Running shader-db for radeonsi - ${device}"
-    env LD_PRELOAD="$LIBDIR/libamdgpu_noop_drm_shim.so" \
-        RADEON_GPU_ID=${device} \
-        ./run -j"${FDO_CI_CONCURRENT:-4}" -o radeonsi ./shaders \
-            > "$ARTIFACTSDIR/radeonsi-${device}-shader-db.txt"
-    section_end shader-db-radeonsi-${device}
-done

.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
-fi
 	mkdir -p "${RESULTS_DIR}"
+fi
 
 function error {
     # we force the following to be not in a section

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

@@ -41,6 +41,7 @@
     - job: debian/x86_64_test-gl
       optional: true
     - job: debian-x86_64
+    - !reference [.required-for-hardware-jobs, needs]
   variables:
     DEBIAN_ARCH: amd64
     S3_ARTIFACT_NAME: mesa-x86_64-default-debugoptimized
@@ -53,6 +54,7 @@
     - job: debian-x86_64
     - job: debian/x86_64_test-vk
       optional: true
+    - !reference [.required-for-hardware-jobs, needs]
   variables:
     DEBIAN_ARCH: amd64
     S3_ARTIFACT_NAME: mesa-x86_64-default-debugoptimized
@@ -64,6 +66,7 @@
   needs:
     - job: debian/x86_64_test-gl
       optional: true
+    - !reference [.required-for-hardware-jobs, needs]
   variables:
     S3_ARTIFACT_NAME: mesa-x86_64-default-debugoptimized
 
@@ -88,6 +91,7 @@
     - job: debian/x86_64_test-android
       artifacts: false
       optional: true
+    - !reference [.required-for-hardware-jobs, needs]
   timeout: 20m
   script:
     - ./install/cuttlefish-runner.sh
@@ -120,31 +124,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 +153,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 +179,16 @@
     # 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
+
+# Jobs that need to pass before spending hardware resources on further testing
+.required-for-hardware-jobs:
+  needs:
+    - job: rustfmt
+      optional: true
+      artifacts: false
+    - job: yaml-toml-shell-py-test
+      optional: true
+      artifacts: false

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

@@ -27,7 +27,7 @@ rustfmt:
     - shopt -s globstar
     - source "$HOME/.cargo/env"
     - rustfmt --version
-    - rustfmt --verbose src/**/*.rs
+    - rustfmt --verbose src/**/lib.rs
 
 shader-db:
   stage: code-validation
@@ -44,7 +44,6 @@ shader-db:
     - !reference [.vc4-rules, rules]
     - !reference [.nouveau-rules, rules]
     - !reference [.r300-rules, rules]
-    - !reference [.radeonsi-collabora-rules, rules]
     # Also run if this job's own config or script changes
     - changes:
         - .gitlab-ci/build/gitlab-ci.yml
@@ -61,6 +60,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 +80,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[@]}")
@@ -97,7 +102,7 @@ printf "%s\n" "Running vkd3d-proton testsuite..."
 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-ci/windows/mesa_deps_msvc.ps1

@@ -27,6 +27,8 @@ Start-Process -NoNewWindow -Wait -FilePath C:\vs_buildtools.exe `
 "--add", "Microsoft.VisualStudio.Component.VC.ATL", `
 "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC", `
 "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
+"--add", "Microsoft.VisualStudio.Component.VC.14.29.16.11.ATL", ` # MSVC 2019
+"--add", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC", `
 "--add", "Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64", `
 "--add", "Microsoft.VisualStudio.Component.VC.Llvm.Clang", `
 "--add", "Microsoft.VisualStudio.Component.Graphics.Tools", `

.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@rosenzweig.io> <alyssa.rosenzweig@intel.com>
-Alyssa Rosenzweig <alyssa@rosenz.ca> <alyssa.rosenzweig@collabora.com>
+Alyssa Rosenzweig <alyssa@rosenzweig.io> <alyssa.rosenzweig@collabora.com>
-Alyssa Rosenzweig <alyssa@rosenz.ca> <alyssa@rosenzweig.io>
+Alyssa Rosenzweig <alyssa@rosenzweig.io> <a@rosenzweig.io>
-Alyssa Rosenzweig <alyssa@rosenz.ca> <a@rosenzweig.io>
+Alyssa Rosenzweig <alyssa@rosenzweig.io> <alyssa@collabora.com>
-Alyssa Rosenzweig <alyssa@rosenz.ca> <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>
@@ -467,8 +460,6 @@ Martin Roukala (né Peres) <martin.roukala@mupuf.org> <martin.peres@mupuf.org>
 Martin Roukala (né Peres) <martin.roukala@mupuf.org> <martin.peres@linux.intel.com>
 Martin Roukala (né Peres) <martin.roukala@mupuf.org> <martin.peres@labri.fr>
 
-Mary Guillemard <mary@mary.zone> <mary.guillemard@collabora.com>
-
 Mathias Fröhlich <mathias.froehlich@gmx.net> Mathias Froehlich <Mathias.Froehlich@gmx.net>
 Mathias Fröhlich <mathias.froehlich@gmx.net> Mathias Froehlich <Mathias.Froehlich@web.de>
 Mathias Fröhlich <mathias.froehlich@gmx.net> Mathias Frohlich <M.Froehlich@science-computing.de>
@@ -623,8 +614,6 @@ Rune Petersen <rune@megahurts.dk> Rune Peterson <rune@megahurts.dk>
 
 Ryan Houdek <sonicadvance1@gmail.com> <Sonicadvance1@gmail.com>
 
-Ryan Mckeever <ryan.mckeever@collabora.com> <rebecca.mckeever@collabora.com>
-
 Sam Hocevar <sam@hocevar.net> Sam Hocevar <sam@zoy.org>
 
 Samuel Iglesias Gonsálvez <siglesias@igalia.com> Samuel Iglesias Gonsalvez <siglesias@igalia.com>

.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

@@ -43,7 +43,6 @@ issues:
         'intel/executor': 'intel-executor'
         'iris': 'iris'
         'isl': 'ISL'
-        'kk': 'KosmicKrisp'
         'lima': 'lima'
         'lima/ppir': 'lima'
         'llvmpipe': 'llvmpipe'
@@ -63,7 +62,6 @@ issues:
         'panfrost': 'panfrost'
         'panvk': 'panvk'
         'pan/midgard': 'panfrost'
-        'poly': 'poly'
         'pvr': 'powervr'
         'r100': 'r100'
         'r200': 'r200'
@@ -122,8 +120,6 @@ 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']
@@ -163,6 +159,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']
@@ -174,7 +171,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']
@@ -233,7 +229,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']
@@ -245,7 +241,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']
@@ -272,8 +268,8 @@ merge_requests:
         '^src/intel/tools/': ['intel-tools']
         '^src/intel/vulkan/': ['ANV']
         '^src/intel/vulkan_hasvk/': ['hasvk']
-        '^src/kosmickrisp/': ['KosmicKrisp']
         '^src/loader/': ['loader']
+        '^src/mapi/': ['mapi']
         '^src/mesa/drivers/dri/i915/': ['i915']
         '^src/mesa/drivers/dri/i965/': ['i965']
         '^src/mesa/drivers/dri/nouveau/': ['vieux']
@@ -288,7 +284,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']
@@ -300,21 +295,14 @@ merge_requests:
         '^src/nouveau/winsys/': ['NVK']
         '^src/panfrost/': ['panfrost']
         '^src/panfrost/vulkan/': ['panvk']
-        '^src/poly/': ['poly']
         '^src/virtio/vulkan/': ['venus']
         '^src/virtio/venus-protocol/': ['venus']
         '^src/virtio/ci/': ['venus']
-        '^src/virtio/virtgpu_kumquat/': ['gfxstream']
-        '^src/virtio/virtgpu_kumquat_ffi/': ['gfxstream']
-        '^src/virtio/protocols/.*kumquat.*': ['gfxstream']
         '^src/util/': ['util']
         '^src/util/00-mesa-defaults.conf': ['drirc']
         '^src/vulkan/': ['vulkan']
         '^src/vulkan/wsi/': ['wsi']
-        '^src/vulkan/wsi/wsi_common_metal': ['macOS']
+        '^VERSION$': ['maintainer-scripts']
-        '^src/vulkan/wsi/wsi_common_wayland.c': ['wayland']
-        '^src/vulkan/wsi/wsi_common_x11.c': ['X11']
-        '^VERSION$': ['mesa-release']
 
         'Android': ['android']
         'EGL': ['EGL']