VERSION: bump for 24.1.2

This fix failure on "dEQP-VK.api.buffer.basic.size_max_uint64".

Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Fixes: 822478ec20 ("panvk: Move the VkBuffer logic to its own source file")
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29783>
(cherry picked from commit c0f8465fa8)

.gitlab-ci.yml

@@ -33,7 +33,7 @@ workflow:
     # merge pipeline
     - if: &is-merge-attempt $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
       variables:
-        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/${S3_KERNEL_BUCKET}/${KERNEL_REPO}/${KERNEL_TAG}
         MESA_CI_PERFORMANCE_ENABLED: 1
         VALVE_INFRA_VANGOGH_JOB_PRIORITY: ""  # Empty tags are ignored by gitlab
     # post-merge pipeline
@@ -41,24 +41,24 @@ workflow:
     # nightly pipeline
     - if: &is-scheduled-pipeline $CI_PIPELINE_SOURCE == "schedule"
       variables:
-        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/${S3_KERNEL_BUCKET}/${KERNEL_REPO}/${KERNEL_TAG}
         JOB_PRIORITY: 50
         VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
     # pipeline for direct pushes that bypassed the CI
     - if: &is-direct-push $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $GITLAB_USER_LOGIN != "marge-bot"
       variables:
-        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/${S3_KERNEL_BUCKET}/${KERNEL_REPO}/${KERNEL_TAG}
         JOB_PRIORITY: 40
         VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
     # pre-merge or fork pipeline
     - if: $FORCE_KERNEL_TAG != null
       variables:
-        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG}
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/${S3_KERNEL_BUCKET}/${KERNEL_REPO}/${FORCE_KERNEL_TAG}
         JOB_PRIORITY: 50
         VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
     - if: $FORCE_KERNEL_TAG == null
       variables:
-        KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
+        KERNEL_IMAGE_BASE: https://${S3_HOST}/${S3_KERNEL_BUCKET}/${KERNEL_REPO}/${KERNEL_TAG}
         JOB_PRIORITY: 50
         VALVE_INFRA_VANGOGH_JOB_PRIORITY: priority:low
 
@@ -72,14 +72,24 @@ variables:
           bash download-git-cache.sh
           rm download-git-cache.sh
           set +o xtrace
-  CI_JOB_JWT_FILE: /minio_jwt
+  S3_JWT_FILE: /s3_jwt
   S3_HOST: s3.freedesktop.org
+  # This bucket is used to fetch the kernel image
+  S3_KERNEL_BUCKET: mesa-rootfs
+  # Bucket for git cache
+  S3_GITCACHE_BUCKET: git-cache
+  # Bucket for the pipeline artifacts pushed to S3
+  S3_ARTIFACTS_BUCKET: artifacts
+  # Buckets for traces
+  S3_TRACIE_RESULTS_BUCKET: mesa-tracie-results
+  S3_TRACIE_PUBLIC_BUCKET: mesa-tracie-public
+  S3_TRACIE_PRIVATE_BUCKET: mesa-tracie-private
   # per-pipeline artifact storage on MinIO
-  PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
+  PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/${S3_ARTIFACTS_BUCKET}/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}
   # per-job artifact storage on MinIO
   JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID}
   # reference images stored for traces
-  PIGLIT_REPLAY_REFERENCE_IMAGES_BASE: "${S3_HOST}/mesa-tracie-results/$FDO_UPSTREAM_REPO"
+  PIGLIT_REPLAY_REFERENCE_IMAGES_BASE: "${S3_HOST}/${S3_TRACIE_RESULTS_BUCKET}/$FDO_UPSTREAM_REPO"
   # For individual CI farm status see .ci-farms folder
   # Disable farm with   `git mv .ci-farms{,-disabled}/$farm_name`
   # Re-enable farm with `git mv .ci-farms{-disabled,}/$farm_name`
@@ -87,15 +97,22 @@ variables:
   ARTIFACTS_BASE_URL: https://${CI_PROJECT_ROOT_NAMESPACE}.${CI_PAGES_DOMAIN}/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts
   # Python scripts for structured logger
   PYTHONPATH: "$PYTHONPATH:$CI_PROJECT_DIR/install"
+  # Drop once deqp-runner is upgraded to > 0.18.0
+  MESA_VK_ABORT_ON_DEVICE_LOSS: 1
+  # Avoid the wall of "Unsupported SPIR-V capability" warnings in CI job log, hiding away useful output
+  MESA_SPIRV_LOG_LEVEL: error
 
 default:
+  id_tokens:
+    S3_JWT:
+      aud: https://s3.freedesktop.org
   before_script:
     - >
       export SCRIPTS_DIR=$(mktemp -d) &&
       curl -L -s --retry 4 -f --retry-all-errors --retry-delay 60 -O --output-dir "${SCRIPTS_DIR}" "${CI_PROJECT_URL}/-/raw/${CI_COMMIT_SHA}/.gitlab-ci/setup-test-env.sh" &&
       . ${SCRIPTS_DIR}/setup-test-env.sh &&
-      echo -n "${CI_JOB_JWT}" > "${CI_JOB_JWT_FILE}" &&
-      unset CI_JOB_JWT  # Unsetting vulnerable env variables
+      echo -n "${S3_JWT}" > "${S3_JWT_FILE}" &&
+      unset CI_JOB_JWT S3_JWT  # Unsetting vulnerable env variables
 
   after_script:
     # Work around https://gitlab.com/gitlab-org/gitlab/-/issues/20338
@@ -104,9 +121,9 @@ default:
     - >
       set +x
 
-      test -e "${CI_JOB_JWT_FILE}" &&
-      export CI_JOB_JWT="$(<${CI_JOB_JWT_FILE})" &&
-      rm "${CI_JOB_JWT_FILE}"
+      test -e "${S3_JWT_FILE}" &&
+      export S3_JWT="$(<${S3_JWT_FILE})" &&
+      rm "${S3_JWT_FILE}"
 
   # Retry when job fails. Failed jobs can be found in the Mesa CI Daily Reports:
   # https://gitlab.freedesktop.org/mesa/mesa/-/issues/?sort=created_date&state=opened&label_name%5B%5D=CI%20daily
@@ -259,8 +276,7 @@ make git archive:
     # compress the current folder
     - tar -cvzf ../$CI_PROJECT_NAME.tar.gz .
 
-    - ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" ../$CI_PROJECT_NAME.tar.gz https://$S3_HOST/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz
-
+    - ci-fairy s3cp --token-file "${S3_JWT_FILE}" ../$CI_PROJECT_NAME.tar.gz https://$S3_HOST/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz
 
 # Sanity checks of MR settings and commit logs
 sanity:
@@ -310,6 +326,22 @@ sanity:
     - placeholder-job
 
 
+mr-label-maker-test:
+  extends:
+    - .fdo.ci-fairy
+  stage: sanity
+  rules:
+    - !reference [.mr-label-maker-rules, rules]
+  variables:
+    GIT_STRATEGY: fetch
+  timeout: 10m
+  script:
+    - set -eu
+    - python3 -m venv .venv
+    - source .venv/bin/activate
+    - pip install git+https://gitlab.freedesktop.org/freedesktop/mr-label-maker
+    - mr-label-maker --dry-run --mr $CI_MERGE_REQUEST_IID
+
 # Jobs that need to pass before spending hardware resources on further testing
 .required-for-hardware-jobs:
   needs:

.gitlab-ci/b2c/b2c.yml.jinja2.jinja2

@@ -61,3 +61,7 @@ deployment:
     initramfs:
       url: '{{ initramfs_url }}'
 
+{% if dtb_url is defined %}
+    dtb:
+      url: '{{ dtb_url }}'
+{% endif %}

.gitlab-ci/bare-metal/poe-off

@@ -10,7 +10,7 @@ if [ -z "$BM_POE_ADDRESS" ]; then
     exit 1
 fi
 
-SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((48 + BM_POE_INTERFACE))"
+SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((${BM_POE_BASE:-0} + BM_POE_INTERFACE))"
 SNMP_OFF="i 2"
 
 flock /var/run/poe.lock -c "snmpset -v2c -r 3 -t 30 -cmesaci $BM_POE_ADDRESS $SNMP_KEY $SNMP_OFF"

.gitlab-ci/bare-metal/poe-on

@@ -10,7 +10,7 @@ if [ -z "$BM_POE_ADDRESS" ]; then
     exit 1
 fi
 
-SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((48 + BM_POE_INTERFACE))"
+SNMP_KEY="SNMPv2-SMI::mib-2.105.1.1.1.3.1.$((${BM_POE_BASE:-0} + BM_POE_INTERFACE))"
 SNMP_ON="i 1"
 SNMP_OFF="i 2"
 

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

@@ -13,7 +13,7 @@ date +'%F %T'
 
 # Make JWT token available as file in the bare-metal storage to enable access
 # to MinIO
-cp "${CI_JOB_JWT_FILE}" "${rootfs_dst}${CI_JOB_JWT_FILE}"
+cp "${S3_JWT_FILE}" "${rootfs_dst}${S3_JWT_FILE}"
 
 date +'%F %T'
 

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

@@ -17,7 +17,6 @@
     paths:
       - _build/meson-logs/*.txt
       - _build/meson-logs/strace
-      - shader-db
       - artifacts
 
 # Just Linux
@@ -71,13 +70,14 @@ debian-testing:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
+      -D glvnd=disabled
       -D platforms=x11,wayland
     GALLIUM_ST: >
       -D dri3=enabled
       -D gallium-nine=true
       -D gallium-va=enabled
       -D gallium-rusticl=true
-    GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915,r300"
+    GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915,r300,svga"
     VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio,nouveau"
     BUILDTYPE: "debugoptimized"
     EXTRA_OPTION: >
@@ -163,6 +163,7 @@ debian-build-testing:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
+      -D glvnd=disabled
       -D platforms=x11,wayland
     GALLIUM_ST: >
       -D dri3=enabled
@@ -181,6 +182,7 @@ debian-build-testing:
       -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,lima,panfrost,asahi
       -D b_lto=true
     LLVM_VERSION: 15
+    S3_ARTIFACT_NAME: debian-build-testing
   script: |
     section_start lava-pytest "lava-pytest"
     .gitlab-ci/lava/lava-pytest.sh
@@ -190,9 +192,27 @@ debian-build-testing:
     .gitlab-ci/run-yamllint.sh
     section_switch meson "meson"
     .gitlab-ci/meson/build.sh
+    .gitlab-ci/prepare-artifacts.sh
+  timeout: 15m
+
+shader-db:
+  stage: code-validation
+  extends:
+    - .use-debian/x86_64_build
+    - .container+build-rules
+  needs:
+    - debian-build-testing
+  variables:
+    S3_ARTIFACT_NAME: debian-build-testing
+  before_script:
+    - !reference [.download_s3, before_script]
+  script: |
     section_switch shader-db "shader-db"
     .gitlab-ci/run-shader-db.sh
-  timeout: 30m
+  artifacts:
+    paths:
+      - shader-db
+  timeout: 15m
 
 # Test a release build with -Werror so new warnings don't sneak in.
 debian-release:
@@ -206,6 +226,7 @@ debian-release:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
+      -D glvnd=disabled
       -D platforms=x11,wayland
     GALLIUM_ST: >
       -D dri3=enabled
@@ -247,7 +268,7 @@ alpine-build-testing:
       -D glx=disabled
       -D gbm=enabled
       -D egl=enabled
-      -D glvnd=false
+      -D glvnd=disabled
       -D platforms=wayland
     LLVM_VERSION: "16"
     GALLIUM_DRIVERS: "crocus,etnaviv,freedreno,iris,kmsro,lima,nouveau,panfrost,r300,r600,radeonsi,svga,swrast,tegra,v3d,vc4,virgl,zink"
@@ -287,7 +308,7 @@ fedora-release:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
-      -D glvnd=true
+      -D glvnd=enabled
       -D platforms=x11,wayland
     EXTRA_OPTION: >
       -D b_lto=true
@@ -340,6 +361,7 @@ debian-android:
       -D glx=disabled
       -D gbm=disabled
       -D egl=enabled
+      -D glvnd=disabled
       -D platforms=android
     EXTRA_OPTION: >
       -D android-stub=true
@@ -420,6 +442,8 @@ debian-arm32:
     - .ci-deqp-artifacts
   variables:
     CROSS: armhf
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -D llvm=disabled
       -D valgrind=disabled
@@ -435,6 +459,8 @@ debian-arm32-asan:
   extends:
     - debian-arm32
   variables:
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -D llvm=disabled
       -D b_sanitize=address
@@ -453,6 +479,8 @@ debian-arm64:
       -Wno-error=array-bounds
       -Wno-error=stringop-truncation
     VULKAN_DRIVERS: "freedreno,broadcom,panfrost,imagination-experimental"
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -D llvm=disabled
       -D valgrind=disabled
@@ -469,6 +497,8 @@ debian-arm64-asan:
   extends:
     - debian-arm64
   variables:
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -D llvm=disabled
       -D b_sanitize=address
@@ -484,6 +514,8 @@ debian-arm64-build-test:
     - .ci-deqp-artifacts
   variables:
     VULKAN_DRIVERS: "amd"
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -Dtools=panfrost,imagination
 
@@ -522,7 +554,7 @@ debian-clang:
       -D glx=dri
       -D gbm=enabled
       -D egl=enabled
-      -D glvnd=true
+      -D glvnd=enabled
       -D platforms=x11,wayland
     GALLIUM_ST: >
       -D dri3=enabled
@@ -604,6 +636,7 @@ debian-vulkan:
       -D opengl=false
       -D gles1=disabled
       -D gles2=disabled
+      -D glvnd=disabled
       -D platforms=x11,wayland
       -D osmesa=false
     GALLIUM_ST: >
@@ -635,6 +668,8 @@ debian-x86_32:
     VULKAN_DRIVERS: intel,amd,swrast,virtio
     GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,swrast,virgl,zink,crocus,d3d12"
     LLVM_VERSION: 15
+    DRI_LOADERS:
+      -D glvnd=disabled
     EXTRA_OPTION: >
       -D vulkan-layers=device-select,overlay
       -D intel-clc=system
@@ -662,6 +697,8 @@ debian-s390x:
     GALLIUM_DRIVERS: "swrast,zink"
     LLVM_VERSION: 15
     VULKAN_DRIVERS: "swrast"
+    DRI_LOADERS:
+      -D glvnd=disabled
 
 debian-ppc64el:
   extends:
@@ -673,3 +710,5 @@ debian-ppc64el:
     CROSS: ppc64el
     GALLIUM_DRIVERS: "nouveau,radeonsi,swrast,virgl,zink"
     VULKAN_DRIVERS: "amd,swrast"
+    DRI_LOADERS:
+      -D glvnd=disabled

.gitlab-ci/common/generate-env.sh

@@ -1,130 +1,136 @@
 #!/bin/bash
 
-for var in \
-    ACO_DEBUG \
-    ARTIFACTS_BASE_URL \
-    ASAN_OPTIONS \
-    BASE_SYSTEM_FORK_HOST_PREFIX \
-    BASE_SYSTEM_MAINLINE_HOST_PREFIX \
-    CI_COMMIT_BRANCH \
-    CI_COMMIT_REF_NAME \
-    CI_COMMIT_TITLE \
-    CI_JOB_ID \
-    CI_JOB_JWT_FILE \
-    CI_JOB_STARTED_AT \
-    CI_JOB_NAME \
-    CI_JOB_URL \
-    CI_MERGE_REQUEST_SOURCE_BRANCH_NAME \
-    CI_MERGE_REQUEST_TITLE \
-    CI_NODE_INDEX \
-    CI_NODE_TOTAL \
-    CI_PAGES_DOMAIN \
-    CI_PIPELINE_ID \
-    CI_PIPELINE_URL \
-    CI_PROJECT_DIR \
-    CI_PROJECT_NAME \
-    CI_PROJECT_PATH \
-    CI_PROJECT_ROOT_NAMESPACE \
-    CI_RUNNER_DESCRIPTION \
-    CI_SERVER_URL \
-    CROSVM_GALLIUM_DRIVER \
-    CROSVM_GPU_ARGS \
-    CURRENT_SECTION \
-    DEQP_BIN_DIR \
-    DEQP_CONFIG \
-    DEQP_EXPECTED_RENDERER \
-    DEQP_FRACTION \
-    DEQP_HEIGHT \
-    DEQP_RESULTS_DIR \
-    DEQP_RUNNER_OPTIONS \
-    DEQP_SUITE \
-    DEQP_TEMP_DIR \
-    DEQP_VER \
-    DEQP_WIDTH \
-    DEVICE_NAME \
-    DRIVER_NAME \
-    EGL_PLATFORM \
-    ETNA_MESA_DEBUG \
-    FDO_CI_CONCURRENT \
-    FDO_UPSTREAM_REPO \
-    FD_MESA_DEBUG \
-    FLAKES_CHANNEL \
-    FREEDRENO_HANGCHECK_MS \
-    GALLIUM_DRIVER \
-    GALLIVM_PERF \
-    GPU_VERSION \
-    GTEST \
-    GTEST_FAILS \
-    GTEST_FRACTION \
-    GTEST_RESULTS_DIR \
-    GTEST_RUNNER_OPTIONS \
-    GTEST_SKIPS \
-    HWCI_FREQ_MAX \
-    HWCI_KERNEL_MODULES \
-    HWCI_KVM \
-    HWCI_START_WESTON \
-    HWCI_START_XORG \
-    HWCI_TEST_SCRIPT \
-    IR3_SHADER_DEBUG \
-    JOB_ARTIFACTS_BASE \
-    JOB_RESULTS_PATH \
-    JOB_ROOTFS_OVERLAY_PATH \
-    KERNEL_IMAGE_BASE \
-    KERNEL_IMAGE_NAME \
-    LD_LIBRARY_PATH \
-    LP_NUM_THREADS \
-    MESA_BASE_TAG \
-    MESA_BUILD_PATH \
-    MESA_DEBUG \
-    MESA_GLES_VERSION_OVERRIDE \
-    MESA_GLSL_VERSION_OVERRIDE \
-    MESA_GL_VERSION_OVERRIDE \
-    MESA_IMAGE \
-    MESA_IMAGE_PATH \
-    MESA_IMAGE_TAG \
-    MESA_LOADER_DRIVER_OVERRIDE \
-    MESA_TEMPLATES_COMMIT \
-    MESA_VK_IGNORE_CONFORMANCE_WARNING \
-    S3_HOST \
-    S3_RESULTS_UPLOAD \
-    NIR_DEBUG \
-    PAN_I_WANT_A_BROKEN_VULKAN_DRIVER \
-    PAN_MESA_DEBUG \
-    PANVK_DEBUG \
-    PIGLIT_FRACTION \
-    PIGLIT_NO_WINDOW \
-    PIGLIT_OPTIONS \
-    PIGLIT_PLATFORM \
-    PIGLIT_PROFILES \
-    PIGLIT_REPLAY_ARTIFACTS_BASE_URL \
-    PIGLIT_REPLAY_DEVICE_NAME \
-    PIGLIT_REPLAY_EXTRA_ARGS \
-    PIGLIT_REPLAY_LOOP_TIMES \
-    PIGLIT_REPLAY_REFERENCE_IMAGES_BASE \
-    PIGLIT_REPLAY_SUBCOMMAND \
-    PIGLIT_RESULTS \
-    PIGLIT_TESTS \
-    PIGLIT_TRACES_FILE \
-    PIPELINE_ARTIFACTS_BASE \
-    RADEON_DEBUG \
-    RADV_DEBUG \
-    RADV_PERFTEST \
-    SKQP_ASSETS_DIR \
-    SKQP_BACKENDS \
-    TU_DEBUG \
-    USE_ANGLE \
-    VIRGL_HOST_API \
-    WAFFLE_PLATFORM \
-    VK_CPU \
-    VK_DRIVER \
-    VK_ICD_FILENAMES \
-    VKD3D_PROTON_RESULTS \
-    VKD3D_CONFIG \
-    VKD3D_TEST_EXCLUDE \
-    ZINK_DESCRIPTORS \
-    ZINK_DEBUG \
-    LVP_POISON_MEMORY \
-    ; do
+VARS=(
+    ACO_DEBUG
+    ARTIFACTS_BASE_URL
+    ASAN_OPTIONS
+    BASE_SYSTEM_FORK_HOST_PREFIX
+    BASE_SYSTEM_MAINLINE_HOST_PREFIX
+    CI_COMMIT_BRANCH
+    CI_COMMIT_REF_NAME
+    CI_COMMIT_TITLE
+    CI_JOB_ID
+    S3_JWT_FILE
+    CI_JOB_STARTED_AT
+    CI_JOB_NAME
+    CI_JOB_URL
+    CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+    CI_MERGE_REQUEST_TITLE
+    CI_NODE_INDEX
+    CI_NODE_TOTAL
+    CI_PAGES_DOMAIN
+    CI_PIPELINE_ID
+    CI_PIPELINE_URL
+    CI_PROJECT_DIR
+    CI_PROJECT_NAME
+    CI_PROJECT_PATH
+    CI_PROJECT_ROOT_NAMESPACE
+    CI_RUNNER_DESCRIPTION
+    CI_SERVER_URL
+    CROSVM_GALLIUM_DRIVER
+    CROSVM_GPU_ARGS
+    CURRENT_SECTION
+    DEQP_BIN_DIR
+    DEQP_CONFIG
+    DEQP_EXPECTED_RENDERER
+    DEQP_FRACTION
+    DEQP_HEIGHT
+    DEQP_RESULTS_DIR
+    DEQP_RUNNER_OPTIONS
+    DEQP_SUITE
+    DEQP_TEMP_DIR
+    DEQP_VER
+    DEQP_WIDTH
+    DEVICE_NAME
+    DRIVER_NAME
+    EGL_PLATFORM
+    ETNA_MESA_DEBUG
+    FDO_CI_CONCURRENT
+    FDO_UPSTREAM_REPO
+    FD_MESA_DEBUG
+    FLAKES_CHANNEL
+    FREEDRENO_HANGCHECK_MS
+    GALLIUM_DRIVER
+    GALLIVM_PERF
+    GPU_VERSION
+    GTEST
+    GTEST_FAILS
+    GTEST_FRACTION
+    GTEST_RESULTS_DIR
+    GTEST_RUNNER_OPTIONS
+    GTEST_SKIPS
+    HWCI_FREQ_MAX
+    HWCI_KERNEL_MODULES
+    HWCI_KVM
+    HWCI_START_WESTON
+    HWCI_START_XORG
+    HWCI_TEST_SCRIPT
+    IR3_SHADER_DEBUG
+    JOB_ARTIFACTS_BASE
+    JOB_RESULTS_PATH
+    JOB_ROOTFS_OVERLAY_PATH
+    KERNEL_IMAGE_BASE
+    KERNEL_IMAGE_NAME
+    LD_LIBRARY_PATH
+    LIBGL_ALWAYS_SOFTWARE
+    LP_NUM_THREADS
+    MESA_BASE_TAG
+    MESA_BUILD_PATH
+    MESA_DEBUG
+    MESA_GLES_VERSION_OVERRIDE
+    MESA_GLSL_VERSION_OVERRIDE
+    MESA_GL_VERSION_OVERRIDE
+    MESA_IMAGE
+    MESA_IMAGE_PATH
+    MESA_IMAGE_TAG
+    MESA_LOADER_DRIVER_OVERRIDE
+    MESA_TEMPLATES_COMMIT
+    MESA_VK_ABORT_ON_DEVICE_LOSS
+    MESA_VK_IGNORE_CONFORMANCE_WARNING
+    S3_HOST
+    S3_RESULTS_UPLOAD
+    NIR_DEBUG
+    PAN_I_WANT_A_BROKEN_VULKAN_DRIVER
+    PAN_MESA_DEBUG
+    PANVK_DEBUG
+    PIGLIT_FRACTION
+    PIGLIT_NO_WINDOW
+    PIGLIT_OPTIONS
+    PIGLIT_PLATFORM
+    PIGLIT_PROFILES
+    PIGLIT_REPLAY_ANGLE_TAG
+    PIGLIT_REPLAY_ARTIFACTS_BASE_URL
+    PIGLIT_REPLAY_DEVICE_NAME
+    PIGLIT_REPLAY_EXTRA_ARGS
+    PIGLIT_REPLAY_LOOP_TIMES
+    PIGLIT_REPLAY_REFERENCE_IMAGES_BASE
+    PIGLIT_REPLAY_SUBCOMMAND
+    PIGLIT_RESULTS
+    PIGLIT_TESTS
+    PIGLIT_TRACES_FILE
+    PIPELINE_ARTIFACTS_BASE
+    RADEON_DEBUG
+    RADV_DEBUG
+    RADV_PERFTEST
+    SKQP_ASSETS_DIR
+    SKQP_BACKENDS
+    TU_DEBUG
+    USE_ANGLE
+    VIRGL_HOST_API
+    WAFFLE_PLATFORM
+    VK_CPU
+    VK_DRIVER
+    # required by virglrender CI
+    VK_DRIVER_FILES
+    VKD3D_PROTON_RESULTS
+    VKD3D_CONFIG
+    VKD3D_TEST_EXCLUDE
+    ZINK_DESCRIPTORS
+    ZINK_DEBUG
+    LVP_POISON_MEMORY
+)
+
+for var in "${VARS[@]}"; do
   if [ -n "${!var+x}" ]; then
     echo "export $var=${!var@Q}"
   fi

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

@@ -113,7 +113,7 @@ export PYTHONPATH=$(python3 -c "import sys;print(\":\".join(sys.path))")
 if [ -n "$MESA_LOADER_DRIVER_OVERRIDE" ]; then
   rm /install/lib/dri/!($MESA_LOADER_DRIVER_OVERRIDE)_dri.so
 fi
-ls -1 /install/lib/dri/*_dri.so
+ls -1 /install/lib/dri/*_dri.so || true
 
 if [ "$HWCI_FREQ_MAX" = "true" ]; then
   # Ensure initialization of the DRM device (needed by MSM)
@@ -165,7 +165,7 @@ fi
 if [ -n "$HWCI_START_XORG" ]; then
   echo "touch /xorg-started; sleep 100000" > /xorg-script
   env \
-    VK_ICD_FILENAMES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
+    VK_DRIVER_FILES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
     xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -s 0 -dpms -logfile /Xorg.0.log &
   BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
 
@@ -192,7 +192,7 @@ if [ -n "$HWCI_START_WESTON" ]; then
   mkdir -p /tmp/.X11-unix
 
   env \
-    VK_ICD_FILENAMES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
+    VK_DRIVER_FILES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
     weston -Bheadless-backend.so --use-gl -Swayland-0 --xwayland --idle-time=0 &
   BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
 
@@ -217,7 +217,7 @@ cleanup
 # upload artifacts
 if [ -n "$S3_RESULTS_UPLOAD" ]; then
   tar --zstd -cf results.tar.zst results/;
-  ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" results.tar.zst https://"$S3_RESULTS_UPLOAD"/results.tar.zst;
+  ci-fairy s3cp --token-file "${S3_JWT_FILE}" results.tar.zst https://"$S3_RESULTS_UPLOAD"/results.tar.zst;
 fi
 
 # We still need to echo the hwci: mesa message, as some scripts rely on it, such

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

@@ -41,6 +41,7 @@ DEPS=(
     libpciaccess-dev
     zlib-dev
     python3-dev
+    py3-cparser
     py3-mako
     py3-ply
     vulkan-headers

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

@@ -16,7 +16,7 @@ set -ex -o pipefail
 # - the GL release produces `glcts`, and
 # - the GLES release produces `deqp-gles*` and `deqp-egl`
 
-DEQP_VK_VERSION=1.3.7.0
+DEQP_VK_VERSION=1.3.8.2
 DEQP_GL_VERSION=4.6.4.0
 DEQP_GLES_VERSION=3.2.10.0
 
@@ -28,28 +28,15 @@ DEQP_GLES_VERSION=3.2.10.0
 
 # shellcheck disable=SC2034
 vk_cts_commits_to_backport=(
-    # Take multiview into account for task shader inv. stats
-    22aa3f4c59f6e1d4daebd5a8c9c05bce6cd3b63b
+    # Fix more ASAN errors due to missing virtual destructors
+    dd40bcfef1b4035ea55480b6fd4d884447120768
 
-    # Remove illegal mesh shader query tests
-    2a87f7b25dc27188be0f0a003b2d7aef69d9002e
-
-    # Relax fragment shader invocations result verifications
-    0d8bf6a2715f95907e9cf86a86876ff1f26c66fe
-
-    # Fix several issues in dynamic rendering basic tests
-    c5453824b498c981c6ba42017d119f5de02a3e34
-
-    # Add setVisible for VulkanWindowDirectDrm
-    a8466bf6ea98f6cd6733849ad8081775318a3e3e
+    # Remove "unused shader stages" tests
+    7dac86c6bbd15dec91d7d9a98cd6dd57c11092a7
 )
 
 # shellcheck disable=SC2034
 vk_cts_patch_files=(
-  # Derivate subgroup fix
-  # https://github.com/KhronosGroup/VK-GL-CTS/pull/442
-  build-deqp-vk_Use-subgroups-helper-in-derivate-tests.patch
-  build-deqp-vk_Add-missing-subgroup-support-checks-for-linear-derivate-tests.patch
 )
 
 if [ "${DEQP_TARGET}" = 'android' ]; then
@@ -83,6 +70,8 @@ gles_cts_commits_to_backport=(
 
 # shellcheck disable=SC2034
 gles_cts_patch_files=(
+  # Correct detection mechanism for EGL_EXT_config_select_group extension
+  build-deqp-egl_Correct-EGL_EXT_config_select_group-extension-query.patch
 )
 
 if [ "${DEQP_TARGET}" = 'android' ]; then
@@ -218,7 +207,7 @@ if [ "${DEQP_TARGET}" != 'android' ]; then
     if [ "${DEQP_API}" = 'VK' ]; then
         for mustpass in $(< /VK-GL-CTS/external/vulkancts/mustpass/main/vk-default.txt) ; do
             cat /VK-GL-CTS/external/vulkancts/mustpass/main/$mustpass \
-                >> /deqp/mustpass/vk-master.txt
+                >> /deqp/mustpass/vk-main.txt
         done
     fi
 
@@ -253,7 +242,7 @@ fi
 
 # Remove other mustpass files, since we saved off the ones we wanted to conventient locations above.
 rm -rf /deqp/external/**/mustpass/
-rm -rf /deqp/external/vulkancts/modules/vulkan/vk-master*
+rm -rf /deqp/external/vulkancts/modules/vulkan/vk-main*
 rm -rf /deqp/external/vulkancts/modules/vulkan/vk-default
 
 rm -rf /deqp/external/openglcts/modules/cts-runner

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

@@ -7,7 +7,7 @@
 
 set -ex
 
-git clone https://github.com/microsoft/DirectX-Headers -b v1.611.0 --depth 1
+git clone https://github.com/microsoft/DirectX-Headers -b v1.613.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-piglit.sh

@@ -8,7 +8,7 @@ set -ex
 # DEBIAN_X86_64_TEST_VK_TAG
 # KERNEL_ROOTFS_TAG
 
-REV="1e631479c0b477006dd7561c55e06269d2878d8d"
+REV="f7ece74a107a2f99b2f494d978c84f8d51faa703"
 
 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit

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

@@ -6,7 +6,7 @@
 # KERNEL_ROOTFS_TAG
 set -ex
 
-VKD3D_PROTON_COMMIT="a0ccc383937903f4ca0997ce53e41ccce7f2f2ec"
+VKD3D_PROTON_COMMIT="c3b385606a93baed42482d822805e0d9c2f3f603"
 
 VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests"
 VKD3D_PROTON_SRC_DIR="/vkd3d-proton-src"

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

@@ -7,7 +7,7 @@
 
 set -ex
 
-VALIDATION_TAG="snapshot-2024wk06"
+VALIDATION_TAG="v1.3.281"
 
 git clone -b "$VALIDATION_TAG" --single-branch --depth 1 https://github.com/KhronosGroup/Vulkan-ValidationLayers.git
 pushd Vulkan-ValidationLayers

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

@@ -3,8 +3,17 @@
 
 set -ex
 
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_BUILD_TAG
+# DEBIAN_X86_64_TEST_ANDROID_TAG
+# DEBIAN_X86_64_TEST_GL_TAG
+# DEBIAN_X86_64_TEST_VK_TAG
+# FEDORA_X86_64_BUILD_TAG
+# KERNEL_ROOTFS_TAG
+
 export LIBWAYLAND_VERSION="1.21.0"
-export WAYLAND_PROTOCOLS_VERSION="1.31"
+export WAYLAND_PROTOCOLS_VERSION="1.34"
 
 git clone https://gitlab.freedesktop.org/wayland/wayland
 cd wayland

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

@@ -64,6 +64,7 @@ DEPS=(
     python3-mako
     python3-pil
     python3-pip
+    python3-pycparser
     python3-requests
     python3-setuptools
     u-boot-tools

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

@@ -70,6 +70,7 @@ DEPS=(
     python3-pil
     python3-pip
     python3-ply
+    python3-pycparser
     python3-requests
     python3-setuptools
     qemu-user

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

@@ -90,6 +90,13 @@ RUSTFLAGS='-L native=/usr/local/lib' cargo install \
   -j ${FDO_CI_CONCURRENT:-4} \
   --root /usr/local
 
+# install cbindgen
+RUSTFLAGS='-L native=/usr/local/lib' cargo install \
+  cbindgen --version 0.26.0 \
+  --locked \
+  -j ${FDO_CI_CONCURRENT:-4} \
+  --root /usr/local
+
 ############### Uninstall the build software
 
 apt-get purge -y "${EPHEMERAL[@]}"

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

@@ -27,6 +27,7 @@ EPHEMERAL=(
     libvulkan-dev
     libwaffle-dev
     libx11-xcb-dev
+    libxcb-dri2-0-dev
     libxcb-ewmh-dev
     libxcb-keysyms1-dev
     libxkbcommon-dev

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

@@ -27,6 +27,7 @@ EPHEMERAL=(
 DEPS=(
     bindgen
     bison
+    cbindgen
     ccache
     clang-devel
     flex
@@ -76,6 +77,7 @@ DEPS=(
     python3-devel
     python3-mako
     python3-ply
+    python3-pycparser
     rust-packaging
     vulkan-headers
     spirv-tools-devel

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

@@ -226,7 +226,7 @@ debian/x86_64_test-vk:
     - debian/x86_64_test-vk
 
 # Debian based x86_64 test image for Android
-debian/x86_64_test-android:
+.debian/x86_64_test-android:
   extends: .use-debian/x86_64_test-base
   variables:
     MESA_IMAGE_TAG: &debian-x86_64_test-android ${DEBIAN_X86_64_TEST_ANDROID_TAG}
@@ -372,7 +372,7 @@ kernel+rootfs_arm32:
     - .container+build-rules
   variables:
     FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_TEMPLATES_COMMIT}"
-    ARTIFACTS_PREFIX: "https://${S3_HOST}/mesa-lava"
+    ARTIFACTS_PREFIX: "https://${S3_HOST}/${S3_KERNEL_BUCKET}"
     ARTIFACTS_SUFFIX: "${MESA_ROOTFS_TAG}--${KERNEL_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
     MESA_ARTIFACTS_TAG: *debian-arm64_build
     MESA_ROOTFS_TAG: *kernel-rootfs

.gitlab-ci/container/lava_build.sh

@@ -14,7 +14,7 @@ export LLVM_VERSION="${LLVM_VERSION:=15}"
 
 check_minio()
 {
-    S3_PATH="${S3_HOST}/mesa-lava/$1/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
+    S3_PATH="${S3_HOST}/${S3_KERNEL_BUCKET}/$1/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
     if curl -L --retry 4 -f --retry-delay 60 -s -X HEAD \
       "https://${S3_PATH}/done"; then
         echo "Remote files are up-to-date, skip rebuilding them."
@@ -365,8 +365,8 @@ popd
 
 . .gitlab-ci/container/container_post_build.sh
 
-ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" /lava-files/"${ROOTFSTAR}" \
+ci-fairy s3cp --token-file "${S3_JWT_FILE}" /lava-files/"${ROOTFSTAR}" \
       https://${S3_PATH}/"${ROOTFSTAR}"
 
 touch /lava-files/done
-ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" /lava-files/done https://${S3_PATH}/done
+ci-fairy s3cp --token-file "${S3_JWT_FILE}" /lava-files/done https://${S3_PATH}/done

.gitlab-ci/container/patches/build-deqp-egl_Correct-EGL_EXT_config_select_group-extension-query.patch

@@ -0,0 +1,45 @@
+From cab41ed387c66a5e7f3454c547fc9ea53587ec1e Mon Sep 17 00:00:00 2001
+From: David Heidelberg <david.heidelberg@collabora.com>
+Date: Thu, 9 May 2024 14:08:59 -0700
+Subject: [PATCH] Correct EGL_EXT_config_select_group extension query
+
+EGL_EXT_config_select_group is a display extension,
+not a client extension.
+
+Affects:
+dEQP-EGL.functional.choose_config.simple.selection_and_sort.*
+
+Ref: https://github.com/KhronosGroup/EGL-Registry/pull/199
+
+Fixes: 88ba9ac270db ("Implement support for the EGL_EXT_config_select_group extension")
+
+Change-Id: I38956511bdcb8e99d585ea9b99aeab53da0457e2
+Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
+---
+ framework/egl/egluConfigInfo.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/framework/egl/egluConfigInfo.cpp b/framework/egl/egluConfigInfo.cpp
+index 88c30fd65..10936055a 100644
+--- a/framework/egl/egluConfigInfo.cpp
++++ b/framework/egl/egluConfigInfo.cpp
+@@ -129,7 +129,6 @@ void queryCoreConfigInfo (const Library& egl, EGLDisplay display, EGLConfig conf
+ void queryExtConfigInfo (const eglw::Library& egl, eglw::EGLDisplay display, eglw::EGLConfig config, ConfigInfo* dst)
+ {
+ 	const std::vector<std::string>	extensions		= getDisplayExtensions(egl, display);
+-	const std::vector<std::string>	clientExtensions	= getClientExtensions(egl);
+ 
+ 	if (de::contains(extensions.begin(), extensions.end(), "EGL_EXT_yuv_surface"))
+ 	{
+@@ -159,7 +158,7 @@ void queryExtConfigInfo (const eglw::Library& egl, eglw::EGLDisplay display, egl
+ 	else
+ 		dst->colorComponentType = EGL_COLOR_COMPONENT_TYPE_FIXED_EXT;
+ 
+-	if (de::contains(clientExtensions.begin(), clientExtensions.end(), "EGL_EXT_config_select_group"))
++	if (hasExtension(egl, display, "EGL_EXT_config_select_group"))
+ 	{
+ 		egl.getConfigAttrib(display, config, EGL_CONFIG_SELECT_GROUP_EXT,	(EGLint*)&dst->groupId);
+ 
+-- 
+2.43.0
+

.gitlab-ci/container/patches/build-deqp-vk_Add-missing-subgroup-support-checks-for-linear-derivate-tests.patch

@@ -1,29 +0,0 @@
-From 7c9aa6f846f9f2f0d70b5c4a8e7c99a3d31b3b1a Mon Sep 17 00:00:00 2001
-From: Rob Clark <robdclark@chromium.org>
-Date: Sat, 27 Jan 2024 10:59:00 -0800
-Subject: [PATCH] Add missing subgroup support checks for linear derivate tests
-
-Some of these tests require subgroup ops support, but didn't bother
-checking whether they were supported.  Add this missing checks.
----
- .../vulkan/shaderrender/vktShaderRenderDerivateTests.cpp   | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDerivateTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDerivateTests.cpp
-index 3253505958..709044f2e8 100644
---- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDerivateTests.cpp
-+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDerivateTests.cpp
-@@ -1145,6 +1145,13 @@ LinearDerivateCase::~LinearDerivateCase (void)
- TestInstance* LinearDerivateCase::createInstance (Context& context) const
- {
- 	DE_ASSERT(m_uniformSetup != DE_NULL);
-+	if (m_fragmentTmpl.find("gl_SubgroupInvocationID") != std::string::npos) {
-+		if (!subgroups::areQuadOperationsSupportedForStages(context, VK_SHADER_STAGE_FRAGMENT_BIT))
-+			throw tcu::NotSupportedError("test requires VK_SUBGROUP_FEATURE_QUAD_BIT");
-+
-+		if (subgroups::getSubgroupSize(context) < 4)
-+			throw tcu::NotSupportedError("test requires subgroupSize >= 4");
-+	}
- 	return new LinearDerivateCaseInstance(context, *m_uniformSetup, m_definitions, m_values);
- }
- 

.gitlab-ci/container/patches/build-deqp-vk_Use-subgroups-helper-in-derivate-tests.patch

@@ -1,56 +0,0 @@
-From ed3794c975d284a5453ae33ae59dd1541a9eb804 Mon Sep 17 00:00:00 2001
-From: Rob Clark <robdclark@chromium.org>
-Date: Sat, 27 Jan 2024 10:57:28 -0800
-Subject: [PATCH] Use subgroups helper in derivate tests
-
-For the tests that need subgroup ops, use the existing subgroups helper,
-rather than open-coding the same checks.
----
- .../vktShaderRenderDerivateTests.cpp          | 23 ++++---------------
- 1 file changed, 5 insertions(+), 18 deletions(-)
-
-diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDerivateTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDerivateTests.cpp
-index a8bb5a3ba7..3253505958 100644
---- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDerivateTests.cpp
-+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDerivateTests.cpp
-@@ -31,6 +31,7 @@
- 
- #include "vktShaderRenderDerivateTests.hpp"
- #include "vktShaderRender.hpp"
-+#include "subgroups/vktSubgroupsTestsUtils.hpp"
- #include "vkImageUtil.hpp"
- #include "vkQueryUtil.hpp"
- 
-@@ -707,28 +708,14 @@ tcu::TestStatus TriangleDerivateCaseInstance::iterate (void)
- 	{
- 		const std::string errorPrefix = m_definitions.inNonUniformControlFlow ? "Derivatives in dynamic control flow" :
- 																				"Manual derivatives with subgroup operations";
--		if (!m_context.contextSupports(vk::ApiVersion(0, 1, 1, 0)))
--			throw tcu::NotSupportedError(errorPrefix + " require Vulkan 1.1");
--
--		vk::VkPhysicalDeviceSubgroupProperties subgroupProperties;
--		deMemset(&subgroupProperties, 0, sizeof(subgroupProperties));
--		subgroupProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES;
--
--		vk::VkPhysicalDeviceProperties2 properties2;
--		deMemset(&properties2, 0, sizeof(properties2));
--		properties2.sType = vk::VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
--		properties2.pNext = &subgroupProperties;
--
--		m_context.getInstanceInterface().getPhysicalDeviceProperties2(m_context.getPhysicalDevice(), &properties2);
-+		if (!subgroups::areQuadOperationsSupportedForStages(m_context, VK_SHADER_STAGE_FRAGMENT_BIT))
-+			throw tcu::NotSupportedError(errorPrefix + " tests require VK_SUBGROUP_FEATURE_QUAD_BIT");
- 
--		if (subgroupProperties.subgroupSize < 4)
-+		if (subgroups::getSubgroupSize(m_context) < 4)
- 			throw tcu::NotSupportedError(errorPrefix + " require subgroupSize >= 4");
- 
--		if ((subgroupProperties.supportedOperations & VK_SUBGROUP_FEATURE_BALLOT_BIT) == 0)
-+		if (!subgroups::isSubgroupFeatureSupportedForDevice(m_context, VK_SUBGROUP_FEATURE_BALLOT_BIT))
- 			throw tcu::NotSupportedError(errorPrefix + " tests require VK_SUBGROUP_FEATURE_BALLOT_BIT");
--
--		if (isSubgroupFunc(m_definitions.func) && (subgroupProperties.supportedOperations & VK_SUBGROUP_FEATURE_QUAD_BIT) == 0)
--			throw tcu::NotSupportedError(errorPrefix + " tests require VK_SUBGROUP_FEATURE_QUAD_BIT");
- 	}
- 
- 	setup();

.gitlab-ci/crosvm-runner.sh

@@ -96,7 +96,7 @@ set +e -x
 NIR_DEBUG="novalidate" \
 LIBGL_ALWAYS_SOFTWARE=${CROSVM_LIBGL_ALWAYS_SOFTWARE} \
 GALLIUM_DRIVER=${CROSVM_GALLIUM_DRIVER} \
-VK_ICD_FILENAMES=$CI_PROJECT_DIR/install/share/vulkan/icd.d/${CROSVM_VK_DRIVER}_icd.x86_64.json \
+VK_DRIVER_FILES=$CI_PROJECT_DIR/install/share/vulkan/icd.d/${CROSVM_VK_DRIVER}_icd.x86_64.json \
 crosvm --no-syslog run \
     --gpu "${CROSVM_GPU_ARGS}" --gpu-render-server "path=/usr/local/libexec/virgl_render_server" \
     -m "${CROSVM_MEMORY:-4096}" -c "${CROSVM_CPU:-2}" --disable-sandbox \

.gitlab-ci/deqp-runner.sh

@@ -18,7 +18,7 @@ INSTALL=$(realpath -s "$PWD"/install)
 # Set up the driver environment.
 export LD_LIBRARY_PATH="$INSTALL"/lib/:$LD_LIBRARY_PATH
 export EGL_PLATFORM=surfaceless
-export VK_ICD_FILENAMES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-$(uname -m)}.json
+export VK_DRIVER_FILES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-$(uname -m)}.json
 export OCL_ICD_VENDORS="$PWD"/install/etc/OpenCL/vendors/
 
 if [ -n "$USE_ANGLE" ]; then
@@ -59,7 +59,7 @@ if [ -z "$DEQP_SUITE" ]; then
 
     # Generate test case list file.
     if [ "$DEQP_VER" = "vk" ]; then
-       MUSTPASS=/deqp/mustpass/vk-master.txt
+       MUSTPASS=/deqp/mustpass/vk-main.txt
        DEQP=/deqp/external/vulkancts/modules/vulkan/deqp-vk
     elif [ "$DEQP_VER" = "gles2" ] || [ "$DEQP_VER" = "gles3" ] || [ "$DEQP_VER" = "gles31" ] || [ "$DEQP_VER" = "egl" ]; then
        MUSTPASS=/deqp/mustpass/$DEQP_VER-main.txt
@@ -169,7 +169,7 @@ fi
 uncollapsed_section_switch deqp "deqp: deqp-runner"
 
 # Print the detailed version with the list of backports and local patches
-for api in vk gl; do
+for api in vk gl gles; do
   deqp_version_log=/deqp/version-$api
   if [ -r "$deqp_version_log" ]; then
     cat "$deqp_version_log"

.gitlab-ci/download-git-cache.sh

@@ -18,7 +18,7 @@ TMP_DIR=$(mktemp -d)
 echo "$(date +"%F %T") Downloading archived master..."
 if ! /usr/bin/wget \
 	      -O "$TMP_DIR/$CI_PROJECT_NAME.tar.gz" \
-              "https://${S3_HOST}/git-cache/${FDO_UPSTREAM_REPO}/$CI_PROJECT_NAME.tar.gz";
+              "https://${S3_HOST}/${S3_GITCACHE_BUCKET}/${FDO_UPSTREAM_REPO}/$CI_PROJECT_NAME.tar.gz";
 then
     echo "Repository cache not available"
     exit

.gitlab-ci/farm-rules.yml

@@ -237,6 +237,25 @@
       when: never
     - !reference [.freedreno-farm-rules, rules]
 
+.vmware-farm-rules:
+  rules:
+    - exists: [ .ci-farms-disabled/vmware ]
+      when: never
+    - changes: [ .ci-farms-disabled/vmware ]
+      if: '$CI_PIPELINE_SOURCE != "schedule"'
+      when: on_success
+    - changes: [ .ci-farms-disabled/* ]
+      if: '$CI_PIPELINE_SOURCE != "schedule"'
+      when: never
+
+.vmware-farm-manual-rules:
+  rules:
+    - exists: [ .ci-farms-disabled/vmware ]
+      when: never
+    - changes: [ .ci-farms-disabled/vmware ]
+      if: '$CI_PIPELINE_SOURCE != "schedule"'
+      when: never
+    - !reference [.vmware-farm-rules, rules]
 
 .ondracka-farm-rules:
   rules:
@@ -311,6 +330,10 @@
       changes: [ .ci-farms-disabled/ondracka ]
       exists: [ .ci-farms-disabled/ondracka ]
       when: never
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes: [ .ci-farms-disabled/vmware ]
+      exists: [ .ci-farms-disabled/vmware ]
+      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)
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "marge-bot"'

.gitlab-ci/fossilize-runner.sh

@@ -11,7 +11,7 @@ INSTALL=$PWD/install
 
 # Set up the driver environment.
 export LD_LIBRARY_PATH="$INSTALL/lib/"
-export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
+export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
 
 # To store Fossilize logs on failure.
 RESULTS="$PWD/results"

.gitlab-ci/image-tags.yml

@@ -13,10 +13,10 @@
 
 variables:
    DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
-   DEBIAN_BASE_TAG: "20240307-virglcrosvm"
+   DEBIAN_BASE_TAG: "20240412-pycparser"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "20240301-mold"
+   DEBIAN_BUILD_TAG: "20240408-cbindgen"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
 
@@ -24,15 +24,15 @@ variables:
    DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk"
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
-   DEBIAN_X86_64_TEST_ANDROID_TAG: "20240311-runner"
-   DEBIAN_X86_64_TEST_GL_TAG: "20240313-ninetests"
-   DEBIAN_X86_64_TEST_VK_TAG: "20240317-direct_drm"
-   KERNEL_ROOTFS_TAG: "20240317-direct_drm"
+   DEBIAN_X86_64_TEST_ANDROID_TAG: "20240423-deqp"
+   DEBIAN_X86_64_TEST_GL_TAG: "20240514-egltrans241"
+   DEBIAN_X86_64_TEST_VK_TAG: "20240423-deqp"
+   KERNEL_ROOTFS_TAG: "20240507-kernel241"
 
-   ALPINE_X86_64_BUILD_TAG: "20240208-libclc-5"
-   ALPINE_X86_64_LAVA_SSH_TAG: "20230626-v1"
-   FEDORA_X86_64_BUILD_TAG: "20240301-mold"
-   KERNEL_TAG: "v6.6.21-mesa-19fc"
+   ALPINE_X86_64_BUILD_TAG: "20240412-pycparser"
+   ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"
+   FEDORA_X86_64_BUILD_TAG: "20240412-pycparser"
+   KERNEL_TAG: "v6.6.21-mesa-f8ea"
    KERNEL_REPO: "gfx-ci/linux"
    PKG_REPO_REV: "3cc12a2a"
 
@@ -40,7 +40,7 @@ variables:
    WINDOWS_X64_MSVC_TAG: "20231222-msvc"
 
    WINDOWS_X64_BUILD_PATH: "windows/x86_64_build"
-   WINDOWS_X64_BUILD_TAG: "20240117-vulkan-sdk"
+   WINDOWS_X64_BUILD_TAG: "20240405-vainfo-ci-1"
 
    WINDOWS_X64_TEST_PATH: "windows/x86_64_test"
-   WINDOWS_X64_TEST_TAG: "20240117-vulkan-sdk"
+   WINDOWS_X64_TEST_TAG: "20240405-vainfo-ci-1"

.gitlab-ci/lava/exceptions.py

@@ -5,24 +5,36 @@ class MesaCIException(Exception):
     pass
 
 
-class MesaCITimeoutError(MesaCIException):
+class MesaCIRetriableException(MesaCIException):
+    pass
+
+
+class MesaCITimeoutError(MesaCIRetriableException):
     def __init__(self, *args, timeout_duration: timedelta) -> None:
         super().__init__(*args)
         self.timeout_duration = timeout_duration
 
 
-class MesaCIRetryError(MesaCIException):
+class MesaCIRetryError(MesaCIRetriableException):
     def __init__(self, *args, retry_count: int, last_job: None) -> None:
         super().__init__(*args)
         self.retry_count = retry_count
         self.last_job = last_job
 
 
-class MesaCIParseException(MesaCIException):
+class MesaCIFatalException(MesaCIException):
+    """Exception raised when the Mesa CI script encounters a fatal error that
+    prevents the script from continuing."""
+
+    def __init__(self, *args) -> None:
+        super().__init__(*args)
+
+
+class MesaCIParseException(MesaCIRetriableException):
     pass
 
 
-class MesaCIKnownIssueException(MesaCIException):
+class MesaCIKnownIssueException(MesaCIRetriableException):
     """Exception raised when the Mesa CI script finds something in the logs that
     is known to cause the LAVA job to eventually fail"""
 

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

@@ -11,7 +11,7 @@ variables:
     # proxy used to cache data locally
     FDO_HTTP_CACHE_URI: "http://caching-proxy/cache/?uri="
     # base system generated by the container build job, shared between many pipelines
-    BASE_SYSTEM_HOST_PREFIX: "${S3_HOST}/mesa-lava"
+    BASE_SYSTEM_HOST_PREFIX: "${S3_HOST}/${S3_KERNEL_BUCKET}"
     BASE_SYSTEM_MAINLINE_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${FDO_UPSTREAM_REPO}/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
     BASE_SYSTEM_FORK_HOST_PATH: "${BASE_SYSTEM_HOST_PREFIX}/${CI_PROJECT_PATH}/${DISTRIBUTION_TAG}/${DEBIAN_ARCH}"
     # per-job build artifacts

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

@@ -30,7 +30,7 @@ artifacts/ci-common/generate-env.sh | tee results/job-rootfs-overlay/set-job-env
 section_end variables
 
 tar zcf job-rootfs-overlay.tar.gz -C results/job-rootfs-overlay/ .
-ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" job-rootfs-overlay.tar.gz "https://${JOB_ROOTFS_OVERLAY_PATH}"
+ci-fairy s3cp --token-file "${S3_JWT_FILE}" job-rootfs-overlay.tar.gz "https://${JOB_ROOTFS_OVERLAY_PATH}"
 
 ARTIFACT_URL="${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME:?}.tar.zst"
 
@@ -50,7 +50,7 @@ PYTHONPATH=artifacts/ artifacts/lava/lava_job_submitter.py \
 	--ci-project-dir "${CI_PROJECT_DIR}" \
 	--device-type "${DEVICE_TYPE}" \
 	--dtb-filename "${DTB}" \
-	--jwt-file "${CI_JOB_JWT_FILE}" \
+	--jwt-file "${S3_JWT_FILE}" \
 	--kernel-image-name "${KERNEL_IMAGE_NAME}" \
 	--kernel-image-type "${KERNEL_IMAGE_TYPE}" \
 	--boot-method "${BOOT_METHOD}" \

.gitlab-ci/lava/lava_job_submitter.py

@@ -16,7 +16,7 @@ import sys
 import time
 from collections import defaultdict
 from dataclasses import dataclass, fields
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from os import environ, getenv, path
 from typing import Any, Optional
 
@@ -25,6 +25,8 @@ from lavacli.utils import flow_yaml as lava_yaml
 
 from lava.exceptions import (
     MesaCIException,
+    MesaCIFatalException,
+    MesaCIRetriableException,
     MesaCIParseException,
     MesaCIRetryError,
     MesaCITimeoutError,
@@ -58,7 +60,7 @@ except ImportError as e:
 
 # Timeout in seconds to decide if the device from the dispatched LAVA job has
 # hung or not due to the lack of new log output.
-DEVICE_HANGING_TIMEOUT_SEC = int(getenv("DEVICE_HANGING_TIMEOUT_SEC",  5*60))
+DEVICE_HANGING_TIMEOUT_SEC = int(getenv("DEVICE_HANGING_TIMEOUT_SEC", 5 * 60))
 
 # How many seconds the script should wait before try a new polling iteration to
 # check if the dispatched LAVA job is running or waiting in the job queue.
@@ -81,18 +83,29 @@ NUMBER_OF_RETRIES_TIMEOUT_DETECTION = int(
     getenv("LAVA_NUMBER_OF_RETRIES_TIMEOUT_DETECTION", 2)
 )
 
+CI_JOB_TIMEOUT_SEC = int(getenv("CI_JOB_TIMEOUT", 3600))
+# How many seconds the script will wait to let LAVA run the job and give the final details.
+EXPECTED_JOB_DURATION_SEC = int(getenv("EXPECTED_JOB_DURATION_SEC", 60 * 10))
+# CI_JOB_STARTED is given by GitLab CI/CD in UTC timezone by default.
+CI_JOB_STARTED_AT_RAW = getenv("CI_JOB_STARTED_AT", "")
+CI_JOB_STARTED_AT: datetime = (
+    datetime.fromisoformat(CI_JOB_STARTED_AT_RAW)
+    if CI_JOB_STARTED_AT_RAW
+    else datetime.now(timezone.utc)
+)
+
 
 def raise_exception_from_metadata(metadata: dict, job_id: int) -> None:
     """
     Investigate infrastructure errors from the job metadata.
-    If it finds an error, raise it as MesaCIException.
+    If it finds an error, raise it as MesaCIRetriableException.
     """
     if "result" not in metadata or metadata["result"] != "fail":
         return
     if "error_type" in metadata:
         error_type = metadata["error_type"]
         if error_type == "Infrastructure":
-            raise MesaCIException(
+            raise MesaCIRetriableException(
                 f"LAVA job {job_id} failed with Infrastructure Error. Retry."
             )
         if error_type == "Job":
@@ -100,12 +113,12 @@ def raise_exception_from_metadata(metadata: dict, job_id: int) -> None:
             # with mal-formed job definitions. As we are always validating the
             # jobs, only the former is probable to happen. E.g.: When some LAVA
             # action timed out more times than expected in job definition.
-            raise MesaCIException(
+            raise MesaCIRetriableException(
                 f"LAVA job {job_id} failed with JobError "
                 "(possible LAVA timeout misconfiguration/bug). Retry."
             )
     if "case" in metadata and metadata["case"] == "validate":
-        raise MesaCIException(
+        raise MesaCIRetriableException(
             f"LAVA job {job_id} failed validation (possible download error). Retry."
         )
 
@@ -182,7 +195,6 @@ def is_job_hanging(job, max_idle_time):
 
 
 def parse_log_lines(job, log_follower, new_log_lines):
-
     if log_follower.feed(new_log_lines):
         # If we had non-empty log data, we can assure that the device is alive.
         job.heartbeat()
@@ -200,7 +212,6 @@ def parse_log_lines(job, log_follower, new_log_lines):
 
 
 def fetch_new_log_lines(job):
-
     # The XMLRPC binary packet may be corrupted, causing a YAML scanner error.
     # Retry the log fetching several times before exposing the error.
     for _ in range(5):
@@ -216,14 +227,28 @@ def submit_job(job):
     try:
         job.submit()
     except Exception as mesa_ci_err:
-        raise MesaCIException(
+        raise MesaCIRetriableException(
             f"Could not submit LAVA job. Reason: {mesa_ci_err}"
         ) from mesa_ci_err
 
 
-def wait_for_job_get_started(job):
+def wait_for_job_get_started(job, attempt_no):
     print_log(f"Waiting for job {job.job_id} to start.")
     while not job.is_started():
+        current_job_duration_sec: int = int(
+            (datetime.now(timezone.utc) - CI_JOB_STARTED_AT).total_seconds()
+        )
+        remaining_time_sec: int = max(0, CI_JOB_TIMEOUT_SEC - current_job_duration_sec)
+        if remaining_time_sec < EXPECTED_JOB_DURATION_SEC:
+            job.cancel()
+            raise MesaCIFatalException(
+                f"{CONSOLE_LOG['BOLD']}"
+                f"{CONSOLE_LOG['FG_YELLOW']}"
+                f"Job {job.job_id} only has {remaining_time_sec} seconds "
+                "remaining to run, but it is expected to take at least "
+                f"{EXPECTED_JOB_DURATION_SEC} seconds."
+                f"{CONSOLE_LOG['RESET']}",
+            )
         time.sleep(WAIT_FOR_DEVICE_POLLING_TIME_SEC)
     job.refresh_log()
     print_log(f"Job {job.job_id} started.")
@@ -299,7 +324,7 @@ def execute_job_with_retries(
         try:
             job_log["submitter_start_time"] = datetime.now().isoformat()
             submit_job(job)
-            wait_for_job_get_started(job)
+            wait_for_job_get_started(job, attempt_no)
             log_follower: LogFollower = bootstrap_log_follower()
             follow_job_execution(job, log_follower)
             return job
@@ -318,6 +343,8 @@ def execute_job_with_retries(
                 f"Finished executing LAVA job in the attempt #{attempt_no}"
                 f"{CONSOLE_LOG['RESET']}"
             )
+            if job.exception and not isinstance(job.exception, MesaCIRetriableException):
+                break
 
     return last_failed_job
 
@@ -471,8 +498,9 @@ class LAVAJobSubmitter(PathResolver):
         if not last_attempt_job:
             # No job was run, something bad happened
             STRUCTURAL_LOG["job_combined_status"] = "script_crash"
-            current_exception = str(sys.exc_info()[0])
+            current_exception = str(sys.exc_info()[1])
             STRUCTURAL_LOG["job_combined_fail_reason"] = current_exception
+            print(f"Interrupting the script. Reason: {current_exception}")
             raise SystemExit(1)
 
         STRUCTURAL_LOG["job_combined_status"] = last_attempt_job.status
@@ -509,7 +537,6 @@ class StructuredLoggerWrapper:
     def logger_context(self):
         context = contextlib.nullcontext()
         try:
-
             global STRUCTURAL_LOG
             STRUCTURAL_LOG = StructuredLogger(
                 self.__submitter.structured_log_file, truncate=True

.gitlab-ci/lava/utils/lava_job.py

@@ -6,6 +6,7 @@ from typing import Any, Optional
 
 from lava.exceptions import (
     MesaCIException,
+    MesaCIRetriableException,
     MesaCIKnownIssueException,
     MesaCIParseException,
     MesaCITimeoutError,
@@ -34,7 +35,7 @@ class LAVAJob:
         self._is_finished = False
         self.log: dict[str, Any] = log
         self.status = "not_submitted"
-        self.__exception: Optional[str] = None
+        self.__exception: Optional[Exception] = None
 
     def heartbeat(self) -> None:
         self.last_log_time: datetime = datetime.now()
@@ -63,13 +64,13 @@ class LAVAJob:
         return self._is_finished
 
     @property
-    def exception(self) -> str:
+    def exception(self) -> Optional[Exception]:
         return self.__exception
 
     @exception.setter
     def exception(self, exception: Exception) -> None:
-        self.__exception = repr(exception)
-        self.log["dut_job_fail_reason"] = self.__exception
+        self.__exception = exception
+        self.log["dut_job_fail_reason"] = repr(self.__exception)
 
     def validate(self) -> Optional[dict]:
         """Returns a dict with errors, if the validation fails.
@@ -176,11 +177,15 @@ class LAVAJob:
             self.status = "canceled"
         elif isinstance(exception, MesaCITimeoutError):
             self.status = "hung"
-        elif isinstance(exception, MesaCIException):
+        elif isinstance(exception, MesaCIRetriableException):
             self.status = "failed"
         elif isinstance(exception, KeyboardInterrupt):
             self.status = "interrupted"
             print_log("LAVA job submitter was interrupted. Cancelling the job.")
             raise
+        elif isinstance(exception, MesaCIException):
+            self.status = "interrupted"
+            print_log("LAVA job submitter was interrupted. Cancelling the job.")
+            raise
         else:
             self.status = "job_submitter_error"

.gitlab-ci/lava/utils/lava_job_definition.py

@@ -15,6 +15,8 @@ from lava.utils.uart_job_definition import (
     fastboot_deploy_actions,
     tftp_boot_action,
     tftp_deploy_actions,
+    qemu_boot_action,
+    qemu_deploy_actions,
     uart_test_actions,
 )
 
@@ -71,6 +73,9 @@ class LAVAJobDefinition:
         if args.boot_method == "fastboot":
             deploy_actions = fastboot_deploy_actions(self, nfsrootfs)
             boot_action = fastboot_boot_action(args)
+        elif args.boot_method == "qemu-nfs":
+            deploy_actions = qemu_deploy_actions(self, nfsrootfs)
+            boot_action = qemu_boot_action(args)
         else:  # tftp
             deploy_actions = tftp_deploy_actions(self, nfsrootfs)
             boot_action = tftp_boot_action(args)
@@ -142,6 +147,10 @@ class LAVAJobDefinition:
         if self.job_submitter.lava_tags:
             values["tags"] = self.job_submitter.lava_tags.split(",")
 
+        # QEMU lava jobs mandate proper arch value in the context
+        if self.job_submitter.boot_method == "qemu-nfs":
+            values["context"]["arch"] = self.job_submitter.mesa_job_name.split(":")[1]
+
         return values
 
     def attach_kernel_and_dtb(self, deploy_field):
@@ -184,7 +193,7 @@ class LAVAJobDefinition:
                     "set +x  # HIDE_START",
                     f'echo -n "{jwt_file.read()}" > "{self.job_submitter.jwt_file}"',
                     "set -x  # HIDE_END",
-                    f'echo "export CI_JOB_JWT_FILE={self.job_submitter.jwt_file}" >> /set-job-env-vars.sh',
+                    f'echo "export S3_JWT_FILE={self.job_submitter.jwt_file}" >> /set-job-env-vars.sh',
                 ]
         else:
             download_steps += [
@@ -203,7 +212,13 @@ class LAVAJobDefinition:
         #   - exec .gitlab-ci/common/init-stage2.sh
 
         with open(self.job_submitter.first_stage_init, "r") as init_sh:
-            run_steps += [x.rstrip() for x in init_sh if not x.startswith("#") and x.rstrip()]
+            # For vmware farm, patch nameserver as 8.8.8.8 is off limit.
+            # This is temporary and will be reverted once the farm is moved.
+            if self.job_submitter.mesa_job_name.startswith("vmware-"):
+                run_steps += [x.rstrip().replace("nameserver 8.8.8.8", "nameserver 10.25.198.110") for x in init_sh if not x.startswith("#") and x.rstrip()]
+            else:
+                run_steps += [x.rstrip() for x in init_sh if not x.startswith("#") and x.rstrip()]
+
         # We cannot distribute the Adreno 660 shader firmware inside rootfs,
         # since the license isn't bundled inside the repository
         if self.job_submitter.device_type == "sm8350-hdk":

.gitlab-ci/lava/utils/uart_job_definition.py

@@ -82,6 +82,24 @@ def tftp_deploy_actions(job_definition: "LAVAJobDefinition", nfsrootfs) -> tuple
     return (tftp_deploy,)
 
 
+def qemu_deploy_actions(job_definition: "LAVAJobDefinition", nfsrootfs) -> tuple[dict[str, Any]]:
+    args = job_definition.job_submitter
+    qemu_deploy = {
+        "timeout": {"minutes": 5},
+        "to": "nfs",
+        "images": {
+            "kernel": {
+                "image_arg": "-kernel {kernel}",
+                "url": f"{args.kernel_url_prefix}/{args.kernel_image_name}",
+            },
+            "nfsrootfs": nfsrootfs,
+        },
+    }
+    job_definition.attach_external_modules(qemu_deploy)
+
+    return (qemu_deploy,)
+
+
 def uart_test_actions(
     args: "LAVAJobSubmitter", init_stage1_steps: list[str], artifact_download_steps: list[str]
 ) -> tuple[dict[str, Any]]:
@@ -140,6 +158,16 @@ def tftp_boot_action(args: "LAVAJobSubmitter") -> dict[str, Any]:
     return tftp_boot
 
 
+def qemu_boot_action(args: "LAVAJobSubmitter") -> dict[str, Any]:
+    qemu_boot = {
+        "failure_retry": NUMBER_OF_ATTEMPTS_LAVA_BOOT,
+        "method": args.boot_method,
+        "prompts": ["lava-shell:"],
+    }
+
+    return qemu_boot
+
+
 def fastboot_boot_action(args: "LAVAJobSubmitter") -> dict[str, Any]:
     fastboot_boot = {
         "timeout": {"minutes": 2},

.gitlab-ci/meson/build.sh

@@ -104,7 +104,7 @@ rm -rf _build
 meson setup _build \
       --native-file=native.file \
       --wrap-mode=nofallback \
-      --force-fallback-for perfetto,syn \
+      --force-fallback-for perfetto,syn,paste \
       ${CROSS+--cross "$CROSS_FILE"} \
       -D prefix=$PWD/install \
       -D libdir=lib \

.gitlab-ci/piglit/piglit-runner.sh

@@ -13,7 +13,7 @@ INSTALL="$PWD/install"
 # Set up the driver environment.
 export LD_LIBRARY_PATH="$INSTALL/lib/"
 export EGL_PLATFORM=surfaceless
-export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-$(uname -m)}.json"
+export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-$(uname -m)}.json"
 
 RESULTS=$PWD/${PIGLIT_RESULTS_DIR:-results}
 mkdir -p $RESULTS

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

@@ -8,7 +8,7 @@ set -ex
 export PAGER=cat  # FIXME: export everywhere
 
 INSTALL=$(realpath -s "$PWD"/install)
-S3_ARGS="--token-file ${CI_JOB_JWT_FILE}"
+S3_ARGS="--token-file ${S3_JWT_FILE}"
 
 RESULTS=$(realpath -s "$PWD"/results)
 mkdir -p "$RESULTS"
@@ -54,7 +54,7 @@ if [ -n "${VK_DRIVER}" ]; then
   export DXVK_LOG="$RESULTS/dxvk"
   [ -d "$DXVK_LOG" ] || mkdir -pv "$DXVK_LOG"
   export DXVK_STATE_CACHE=0
-  export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-$(uname -m)}.json"
+  export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.${VK_CPU:-$(uname -m)}.json"
 fi
 
 # Sanity check to ensure that our environment is sufficient to make our tests
@@ -117,7 +117,7 @@ else
       mkdir -p /tmp/.X11-unix
 
       env \
-        VK_ICD_FILENAMES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
+        VK_DRIVER_FILES="/install/share/vulkan/icd.d/${VK_DRIVER}_icd.$(uname -m).json" \
 	weston -Bheadless-backend.so --use-gl -Swayland-0 --xwayland --idle-time=0 &
 
       while [ ! -S "$WESTON_X11_SOCK" ]; do sleep 1; done
@@ -189,6 +189,15 @@ 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_TAG" ]; then
+  ARCH="amd64"
+  FILE="angle-bin-${ARCH}-${PIGLIT_REPLAY_ANGLE_TAG}.tar.zst"
+  ci-fairy s3cp $S3_ARGS "https://s3.freedesktop.org/mesa-tracie-private/${FILE}" "${FILE}"
+  mkdir -p replayer-db/angle
+  tar --zstd -xf ${FILE} -C replayer-db/angle/
+fi
+
 if ! eval $RUN_CMD;
 then
     printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION"

.gitlab-ci/prepare-artifacts.sh

@@ -38,7 +38,6 @@ cp -Rp .gitlab-ci/fossilize-runner.sh install/
 cp -Rp .gitlab-ci/crosvm-init.sh install/
 cp -Rp .gitlab-ci/*.txt install/
 cp -Rp .gitlab-ci/report-flakes.py install/
-cp -Rp .gitlab-ci/valve install/
 cp -Rp .gitlab-ci/vkd3d-proton install/
 cp -Rp .gitlab-ci/setup-test-env.sh install/
 cp -Rp .gitlab-ci/*-runner.sh install/
@@ -61,7 +60,7 @@ if [ -n "$S3_ARTIFACT_NAME" ]; then
     # Pass needed files to the test stage
     S3_ARTIFACT_NAME="$S3_ARTIFACT_NAME.tar.zst"
     zstd artifacts/install.tar -o ${S3_ARTIFACT_NAME}
-    ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" ${S3_ARTIFACT_NAME} https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME}
+    ci-fairy s3cp --token-file "${S3_JWT_FILE}" ${S3_ARTIFACT_NAME} https://${PIPELINE_ARTIFACTS_BASE}/${S3_ARTIFACT_NAME}
 fi
 
 section_end prepare-artifacts

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

@@ -10,7 +10,7 @@ export LD_LIBRARY_PATH=$LIBDIR
 
 cd /usr/local/shader-db
 
-for driver in freedreno intel 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 \

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

@@ -14,6 +14,14 @@ function x_off {
 
 # TODO: implement x_on !
 
+export JOB_START_S=$(date -u +"%s" -d "${CI_JOB_STARTED_AT:?}")
+
+function get_current_minsec {
+    DATE_S=$(date -u +"%s")
+    CURR_TIME=$((DATE_S-JOB_START_S))
+    printf "%02d:%02d" $((CURR_TIME/60)) $((CURR_TIME%60))
+}
+
 function error {
     x_off 2>/dev/null
     RED="\e[0;31m"
@@ -21,10 +29,7 @@ function error {
     # we force the following to be not in a section
     section_end $CURRENT_SECTION
 
-    DATE_S=$(date -u +"%s")
-    JOB_START_S=$(date -u +"%s" -d "${CI_JOB_STARTED_AT:?}")
-    CURR_TIME=$((DATE_S-JOB_START_S))
-    CURR_MINSEC="$(printf "%02d" $((CURR_TIME/60))):$(printf "%02d" $((CURR_TIME%60)))"
+    CURR_MINSEC=$(get_current_minsec)
     echo -e "\n${RED}[${CURR_MINSEC}] ERROR: $*${ENDCOLOR}\n"
     [ "$state_x" -eq 0 ] || set -x
 }
@@ -42,10 +47,7 @@ function build_section_start {
     CYAN="\e[0;36m"
     ENDCOLOR="\e[0m"
 
-    DATE_S=$(date -u +"%s")
-    JOB_START_S=$(date -u +"%s" -d "${CI_JOB_STARTED_AT:?}")
-    CURR_TIME=$((DATE_S-JOB_START_S))
-    CURR_MINSEC="$(printf "%02d" $((CURR_TIME/60))):$(printf "%02d" $((CURR_TIME%60)))"
+    CURR_MINSEC=$(get_current_minsec)
     echo -e "\n\e[0Ksection_start:$(date +%s):$section_name$section_params\r\e[0K${CYAN}[${CURR_MINSEC}] $*${ENDCOLOR}\n"
 }
 
@@ -87,6 +89,7 @@ function uncollapsed_section_switch {
 }
 
 export -f x_off
+export -f get_current_minsec
 export -f error
 export -f trap_err
 export -f build_section_start

.gitlab-ci/test-source-dep.yml

@@ -227,7 +227,10 @@
 .lint-rustfmt-rules:
   rules:
     - !reference [.never-post-merge-rules, rules]
-    - !reference [.core-rules, rules]
+    - !reference [.no_scheduled_pipelines-rules, rules]
+    - changes:
+        - .gitlab-ci.yml
+        - .gitlab-ci/**/*
     # in merge pipeline, formatting checks are not allowed to fail
     - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
       changes: &rust_file_list
@@ -238,3 +241,13 @@
     - changes: *rust_file_list
       when: on_success
       allow_failure: true
+
+# Rules for .mr-label-maker.yml
+.mr-label-maker-rules:
+  rules:
+    - !reference [.never-post-merge-rules, rules]
+    - !reference [.no_scheduled_pipelines-rules, rules]
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+        - .mr-label-maker.yml
+      when: on_success

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

@@ -43,7 +43,7 @@ rustfmt:
     - rustfmt --verbose src/**/lib.rs
     - rustfmt --verbose src/**/main.rs
 
-.test-check:
+python-test:
   # Cancel job if a newer commit is pushed to the same branch
   interruptible: true
   stage: code-validation
@@ -52,10 +52,6 @@ rustfmt:
   variables:
     GIT_STRATEGY: fetch
   timeout: 10m
-
-python-test:
-  extends:
-    - .test-check
   script:
     - cd bin/ci
     - pip install --break-system-packages -r test/requirements.txt
@@ -63,8 +59,18 @@ python-test:
   rules:
     - !reference [.disable-farm-mr-rules, rules]
     - !reference [.never-post-merge-rules, rules]
-    - changes:
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+      when: on_success
+    - if: $CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_NAMESPACE == "mesa" && $GITLAB_USER_LOGIN != "marge-bot"
+      when: on_success
+    - if: $GITLAB_USER_LOGIN == "marge-bot"
+      changes: &bin_ci_files
+        - .gitlab-ci.yml
+        - .gitlab-ci/**/*
         - bin/ci/**/*
+      when: on_success
+    - changes: *bin_ci_files
+      when: manual
 
 .test-gl:
   extends:
@@ -152,7 +158,7 @@ python-test:
     exclude:
       - results/*.shader_cache
   variables:
-    PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-public --jwt-file=${CI_JOB_JWT_FILE}
+    PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=${S3_TRACIE_PUBLIC_BUCKET} --jwt-file=${S3_JWT_FILE}
     # until we overcome Infrastructure issues, give traces extra 5 min before timeout
     DEVICE_HANGING_TIMEOUT_SEC: 600
   script:
@@ -180,11 +186,7 @@ python-test:
     paths:
       - results/
 
-.baremetal-test:
-  extends:
-    - .test
-  # Cancel job if a newer commit is pushed to the same branch
-  interruptible: true
+.download_s3:
   before_script:
     - !reference [default, before_script]
     # Use this instead of gitlab's artifacts download because it hits packet.net
@@ -196,6 +198,14 @@ python-test:
     - 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
+
+.baremetal-test:
+  extends:
+    - .test
+  # Cancel job if a newer commit is pushed to the same branch
+  interruptible: true
+  before_script:
+    - !reference [.download_s3, before_script]
   variables:
     BM_ROOTFS: /rootfs-${DEBIAN_ARCH}
   artifacts:
@@ -397,7 +407,7 @@ python-test:
     reports:
       junit: results/**/junit.xml
 
-.b2c-test-vk:
+.b2c-x86_64-test-vk:
   extends:
     - .use-debian/x86_64_test-vk
     - .b2c-test
@@ -406,7 +416,7 @@ python-test:
     - debian-testing
     - !reference [.required-for-hardware-jobs, needs]
 
-.b2c-test-gl:
+.b2c-x86_64-test-gl:
   extends:
     - .use-debian/x86_64_test-gl
     - .b2c-test

.gitlab-ci/tests/test_lava_job_submitter.py

@@ -15,7 +15,7 @@ from typing import Generator
 from unittest.mock import MagicMock, patch
 
 import pytest
-from lava.exceptions import MesaCIException, MesaCIRetryError
+from lava.exceptions import MesaCIException, MesaCIRetryError, MesaCIFatalException
 from lava.lava_job_submitter import (
     DEVICE_HANGING_TIMEOUT_SEC,
     NUMBER_OF_RETRIES_TIMEOUT_DETECTION,
@@ -24,6 +24,7 @@ from lava.lava_job_submitter import (
     bootstrap_log_follower,
     follow_job_execution,
     retriable_follow_job,
+    wait_for_job_get_started,
 )
 from lava.utils import LogSectionType
 
@@ -83,7 +84,7 @@ def lava_job_submitter(
 def test_submit_and_follow_respects_exceptions(mock_sleep, mock_proxy, exception):
     with pytest.raises(MesaCIException):
         proxy = mock_proxy(side_effect=exception)
-        job = LAVAJob(proxy, '')
+        job = LAVAJob(proxy, "")
         log_follower = bootstrap_log_follower()
         follow_job_execution(job, log_follower)
 
@@ -165,21 +166,13 @@ PROXY_SCENARIOS = {
         mock_logs(result="pass"),
         does_not_raise(),
         "pass",
-        {
-            "testsuite_results": [
-                generate_testsuite_result(result="pass")
-            ]
-        },
+        {"testsuite_results": [generate_testsuite_result(result="pass")]},
     ),
     "no retries, but testsuite fails": (
         mock_logs(result="fail"),
         does_not_raise(),
         "fail",
-        {
-            "testsuite_results": [
-                generate_testsuite_result(result="fail")
-            ]
-        },
+        {"testsuite_results": [generate_testsuite_result(result="fail")]},
     ),
     "no retries, one testsuite fails": (
         generate_n_logs(n=1, tick_fn=0, result="fail"),
@@ -188,7 +181,7 @@ PROXY_SCENARIOS = {
         {
             "testsuite_results": [
                 generate_testsuite_result(result="fail"),
-                generate_testsuite_result(result="pass")
+                generate_testsuite_result(result="pass"),
             ]
         },
     ),
@@ -265,6 +258,27 @@ def test_simulate_a_long_wait_to_start_a_job(
     assert delta_time.total_seconds() >= wait_time
 
 
+LONG_LAVA_QUEUE_SCENARIOS = {
+    "no_time_to_run": (0, pytest.raises(MesaCIFatalException)),
+    "enough_time_to_run": (9999999999, does_not_raise()),
+}
+
+
+@pytest.mark.parametrize(
+    "job_timeout, expectation",
+    LONG_LAVA_QUEUE_SCENARIOS.values(),
+    ids=LONG_LAVA_QUEUE_SCENARIOS.keys(),
+)
+def test_wait_for_job_get_started_no_time_to_run(monkeypatch, job_timeout, expectation):
+    monkeypatch.setattr("lava.lava_job_submitter.CI_JOB_TIMEOUT_SEC", job_timeout)
+    job = MagicMock()
+    # Make it escape the loop
+    job.is_started.side_effect = (False, False, True)
+    with expectation as e:
+        wait_for_job_get_started(job, 1)
+    if e:
+        job.cancel.assert_called_with()
+
 
 CORRUPTED_LOG_SCENARIOS = {
     "too much subsequent corrupted data": (
@@ -438,9 +452,7 @@ def test_job_combined_status(
         "lava.lava_job_submitter.retriable_follow_job"
     ) as mock_retriable_follow_job, patch(
         "lava.lava_job_submitter.LAVAJobSubmitter._LAVAJobSubmitter__prepare_submission"
-    ) as mock_prepare_submission, patch(
-        "sys.exit"
-    ):
+    ) as mock_prepare_submission, patch("sys.exit"):
         from lava.lava_job_submitter import STRUCTURAL_LOG
 
         mock_retriable_follow_job.return_value = MagicMock(status=finished_job_status)

.gitlab-ci/valve/traces-runner.sh

@@ -1,87 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2086 # we want word splitting
-
-set -ex
-
-if [[ -z "$VK_DRIVER" ]]; then
-    exit 1
-fi
-
-# Useful debug output, you rarely know what envirnoment you'll be
-# running in within container-land, this can be a landmark.
-ls -l
-
-INSTALL=$(realpath -s "$PWD"/install)
-RESULTS=$(realpath -s "$PWD"/results)
-
-# Set up the driver environment.
-# Modifiying here directly LD_LIBRARY_PATH may cause problems when
-# using a command wrapper. Hence, we will just set it when running the
-# command.
-export __LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/"
-
-# Sanity check to ensure that our environment is sufficient to make our tests
-# run against the Mesa built by CI, rather than any installed distro version.
-MESA_VERSION=$(sed 's/\./\\./g' "$INSTALL/VERSION")
-
-# Force the stdout and stderr streams to be unbuffered in python.
-export PYTHONUNBUFFERED=1
-
-# Set the Vulkan driver to use.
-export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
-if [ "${VK_DRIVER}" = "radeon" ]; then
-    # Disable vsync
-    export MESA_VK_WSI_PRESENT_MODE=mailbox
-    export vblank_mode=0
-fi
-
-# Set environment for Wine.
-export WINEDEBUG="-all"
-export WINEPREFIX="/dxvk-wine64"
-export WINEESYNC=1
-
-# Wait for amdgpu to be fully loaded
-sleep 1
-
-# Avoid having to perform nasty command pre-processing to insert the
-# wine executable in front of the test executables. Instead, use the
-# kernel's binfmt support to automatically use Wine as an interpreter
-# when asked to load PE executables.
-# TODO: Have boot2container mount this filesystem for all jobs?
-mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
-echo ':DOSWin:M::MZ::/usr/bin/wine64:' > /proc/sys/fs/binfmt_misc/register
-
-# Set environment for DXVK.
-export DXVK_LOG_LEVEL="info"
-export DXVK_LOG="$RESULTS/dxvk"
-[ -d "$DXVK_LOG" ] || mkdir -pv "$DXVK_LOG"
-export DXVK_STATE_CACHE=0
-
-# Set environment for replaying traces.
-export PATH="/apitrace-msvc-win64/bin:/gfxreconstruct/build/bin:$PATH"
-
-SANITY_MESA_VERSION_CMD="vulkaninfo"
-
-# Set up the Window System Interface (WSI)
-# TODO: Can we get away with GBM?
-if [ "${TEST_START_XORG:-0}" -eq 1 ]; then
-    "$INSTALL"/common/start-x.sh "$INSTALL"
-    export DISPLAY=:0
-fi
-
-wine64 --version
-
-SANITY_MESA_VERSION_CMD="$SANITY_MESA_VERSION_CMD | tee /tmp/version.txt | grep \"Mesa $MESA_VERSION\(\s\|$\)\""
-
-RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $SANITY_MESA_VERSION_CMD"
-
-set +e
-if ! eval $RUN_CMD;
-then
-    printf "%s\n" "Found $(cat /tmp/version.txt), expected $MESA_VERSION"
-fi
-set -e
-
-# Just to be sure...
-chmod +x ./valvetraces-run.sh
-./valvetraces-run.sh

.gitlab-ci/vkd3d-proton/run.sh

@@ -23,7 +23,7 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/:/vkd3d-proton-tests/x64/"
 MESA_VERSION=$(sed 's/\./\\./g' "$INSTALL/VERSION")
 
 # Set the Vulkan driver to use.
-export VK_ICD_FILENAMES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
+export VK_DRIVER_FILES="$INSTALL/share/vulkan/icd.d/${VK_DRIVER}_icd.x86_64.json"
 
 # Set environment for Wine.
 export WINEDEBUG="-all"

.gitlab-ci/windows/Dockerfile_build

@@ -7,6 +7,10 @@ COPY mesa_deps_vulkan_sdk.ps1 C:\
 RUN C:\mesa_deps_vulkan_sdk.ps1
 
 COPY mesa_init_msvc.ps1 C:\
+
+COPY mesa_deps_libva.ps1 C:\
+RUN C:\mesa_deps_libva.ps1
+
 COPY mesa_deps_build.ps1 C:\
 RUN C:\mesa_deps_build.ps1
 

.gitlab-ci/windows/Dockerfile_test

@@ -14,6 +14,9 @@ RUN C:\mesa_deps_rust.ps1
 
 COPY mesa_init_msvc.ps1 C:\
 
+COPY mesa_deps_libva.ps1 C:\
+RUN C:\mesa_deps_libva.ps1
+
 COPY mesa_deps_test_piglit.ps1 C:\
 RUN C:\mesa_deps_test_piglit.ps1
 COPY mesa_deps_test_deqp.ps1 c:\

.gitlab-ci/windows/deqp_runner_run.ps1

@@ -1,4 +1,4 @@
-# VK_ICD_FILENAMES environment variable is not used when running with
+# VK_DRIVER_FILES environment variable is not used when running with
 # elevated privileges. Add a key to the registry instead.
 $hkey_path = "HKLM:\SOFTWARE\Khronos\Vulkan\Drivers\"
 $hkey_name = Join-Path -Path $pwd -ChildPath "_install\share\vulkan\icd.d\dzn_icd.x86_64.json"

.gitlab-ci/windows/mesa_build.ps1

@@ -84,4 +84,6 @@ Copy-Item ".\.gitlab-ci\windows\spirv2dxil_run.ps1" -Destination $installdir
 
 Copy-Item ".\.gitlab-ci\windows\deqp_runner_run.ps1" -Destination $installdir
 
+Copy-Item ".\.gitlab-ci\windows\vainfo_run.ps1" -Destination $installdir
+
 Get-ChildItem -Recurse -Filter "ci" | Get-ChildItem -Include "*.txt","*.toml" | Copy-Item -Destination $installdir

.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.611.0 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
+git clone -b v1.613.1 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
 if (!$?) {
   Write-Host "Failed to clone DirectX-Headers repository"
   Exit 1
@@ -32,16 +32,17 @@ if (!$buildstatus) {
 
 Get-Date
 Write-Host "Cloning zlib"
-git clone -b v1.2.13 --depth=1 https://github.com/madler/zlib deps/zlib
+git clone -b v1.3.1 --depth=1 https://github.com/madler/zlib deps/zlib
 if (!$?) {
   Write-Host "Failed to clone zlib repository"
   Exit 1
 }
 Write-Host "Downloading zlib meson build files"
-Invoke-WebRequest -Uri "https://wrapdb.mesonbuild.com/v2/zlib_1.2.13-1/get_patch" -OutFile deps/zlib.zip
+Invoke-WebRequest -Uri "https://wrapdb.mesonbuild.com/v2/zlib_1.3.1-1/get_patch" -OutFile deps/zlib.zip
 Expand-Archive -Path deps/zlib.zip -Destination deps/zlib
 # Wrap archive puts build files in a version subdir
-Move-Item deps/zlib/zlib-1.2.13/* deps/zlib
+robocopy deps/zlib/zlib-1.3.1 deps/zlib /E
+Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path deps/zlib/zlib-1.3.1
 $zlib_build = New-Item -ItemType Directory -Path ".\deps\zlib" -Name "build"
 Push-Location -Path $zlib_build.FullName
 meson .. --backend=ninja -Dprefix="$depsInstallPath" --default-library=static --buildtype=release -Db_vscrt=mt && `
@@ -54,35 +55,6 @@ if (!$buildstatus) {
   Exit 1
 }
 
-
-Get-Date
-Write-Host "Cloning libva"
-git clone https://github.com/intel/libva.git deps/libva
-if (!$?) {
-  Write-Host "Failed to clone libva repository"
-  Exit 1
-}
-
-Push-Location -Path ".\deps\libva"
-Write-Host "Checking out libva df3c584bb79d1a1e521372d62fa62e8b1c52ce6c"
-# libva-win32 is released with libva version 2.17 (see https://github.com/intel/libva/releases/tag/2.17.0)
-git checkout 2.17.0
-Pop-Location
-
-Write-Host "Building libva"
-# libva already has a build dir in their repo, use builddir instead
-$libva_build = New-Item -ItemType Directory -Path ".\deps\libva" -Name "builddir"
-Push-Location -Path $libva_build.FullName
-meson .. -Dprefix="$depsInstallPath"
-ninja -j32 install
-$buildstatus = $?
-Pop-Location
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $libva_build
-if (!$buildstatus) {
-  Write-Host "Failed to compile libva"
-  Exit 1
-}
-
 Get-Date
 Write-Host "Cloning LLVM release/15.x"
 git clone -b release/15.x --depth=1 https://github.com/llvm/llvm-project deps/llvm-project

.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.610.2 -OutFile 'agility.zip'
+Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.613.2 -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'
@@ -18,7 +18,7 @@ Remove-Item -Recurse 'C:\agility'
 
 Write-Host "Downloading Updated WARP at:"
 Get-Date
-Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/1.0.9 -OutFile 'warp.zip'
+Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/1.0.11 -OutFile 'warp.zip'
 Expand-Archive -Path 'warp.zip' -DestinationPath 'C:\warp'
 # Copy WARP into mesa-deps\bin
 Copy-Item 'C:\warp\build\native\amd64\d3d10warp.dll' -Destination $depsInstallPath\bin
@@ -27,7 +27,7 @@ Remove-Item -Recurse 'C:\warp'
 
 Write-Host "Downloading DirectXShaderCompiler release at:"
 Get-Date
-Invoke-WebRequest -Uri https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2207/dxc_2022_07_18.zip -OutFile 'DXC.zip'
+Invoke-WebRequest -Uri https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.8.2403/dxc_2024_03_07.zip -OutFile 'DXC.zip'
 Expand-Archive -Path 'DXC.zip' -DestinationPath 'C:\DXC'
 # No more need to get dxil.dll from the VS install
 Copy-Item 'C:\DXC\bin\x64\*.dll' -Destination 'C:\Windows\System32'

.gitlab-ci/windows/mesa_deps_libva.ps1

@@ -0,0 +1,79 @@
+# Compiling libva/libva-utils deps
+
+$ProgressPreference = "SilentlyContinue"
+$MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent
+. "$MyPath\mesa_init_msvc.ps1"
+
+Remove-Item -Recurse -Force -ErrorAction SilentlyContinue "deps" | Out-Null
+$depsInstallPath="C:\mesa-deps"
+
+Write-Host "Cloning libva at:"
+Get-Date
+git clone https://github.com/intel/libva.git deps/libva
+if (!$?) {
+  Write-Host "Failed to clone libva repository"
+  Exit 1
+}
+
+Write-Host "Cloning libva finished at:"
+Get-Date
+
+Write-Host "Building libva at:"
+Get-Date
+
+Push-Location -Path ".\deps\libva"
+Write-Host "Checking out libva..."
+git checkout 2.21.0
+Pop-Location
+
+# libva already has a build dir in their repo, use builddir instead
+$libva_build = New-Item -ItemType Directory -Path ".\deps\libva" -Name "builddir"
+Push-Location -Path $libva_build.FullName
+meson .. -Dprefix="$depsInstallPath"
+ninja -j32 install
+$buildstatus = $?
+Pop-Location
+Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $libva_build
+if (!$buildstatus) {
+  Write-Host "Failed to compile libva"
+  Exit 1
+}
+
+Write-Host "Building libva finished at:"
+Get-Date
+
+Write-Host "Cloning libva-utils at:"
+Get-Date
+git clone https://github.com/intel/libva-utils.git deps/libva-utils
+if (!$?) {
+  Write-Host "Failed to clone libva-utils repository"
+  Exit 1
+}
+
+Write-Host "Cloning libva-utils finished at:"
+Get-Date
+
+Write-Host "Building libva-utils at:"
+Get-Date
+
+Push-Location -Path ".\deps\libva-utils"
+Write-Host "Checking out libva-utils..."
+git checkout 2.21.0
+Pop-Location
+
+Write-Host "Building libva-utils"
+# libva-utils already has a build dir in their repo, use builddir instead
+$libva_utils_build = New-Item -ItemType Directory -Path ".\deps\libva-utils" -Name "builddir"
+Push-Location -Path $libva_utils_build.FullName
+meson .. -Dprefix="$depsInstallPath" --pkg-config-path="$depsInstallPath\lib\pkgconfig;$depsInstallPath\share\pkgconfig"
+ninja -j32 install
+$buildstatus = $?
+Pop-Location
+Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $libva_utils_build
+if (!$buildstatus) {
+  Write-Host "Failed to compile libva-utils"
+  Exit 1
+}
+
+Write-Host "Building libva-utils finished at:"
+Get-Date

.gitlab-ci/windows/vainfo_run.ps1

@@ -0,0 +1,99 @@
+
+function Deploy-Dependencies {
+  param (
+    [string] $deploy_directory
+  )
+  
+  Write-Host "Copying libva runtime and driver at:"
+  Get-Date
+
+  # Copy the VA runtime binaries from the mesa built dependencies so the versions match with the built mesa VA driver binary
+  $depsInstallPath="C:\mesa-deps"
+  Copy-Item "$depsInstallPath\bin\vainfo.exe" -Destination "$deploy_directory\vainfo.exe"
+  Copy-Item "$depsInstallPath\bin\va_win32.dll" -Destination "$deploy_directory\va_win32.dll"
+  Copy-Item "$depsInstallPath\bin\va.dll" -Destination "$deploy_directory\va.dll"
+
+  # Copy Agility SDK into D3D12 subfolder of vainfo
+  New-Item -ItemType Directory -Force -Path "$deploy_directory\D3D12" | Out-Null
+  Copy-Item "$depsInstallPath\bin\D3D12\D3D12Core.dll" -Destination "$deploy_directory\D3D12\D3D12Core.dll"
+  Copy-Item "$depsInstallPath\bin\D3D12\d3d12SDKLayers.dll" -Destination "$deploy_directory\D3D12\d3d12SDKLayers.dll"
+
+  # Copy WARP next to vainfo
+  Copy-Item "$depsInstallPath\bin\d3d10warp.dll" -Destination "$deploy_directory\d3d10warp.dll"
+
+  Write-Host "Copying libva runtime and driver finished at:"
+  Get-Date
+}
+
+function Check-VAInfo-Entrypoint {
+  param (
+    [string] $vainfo_app_path,
+    [string] $entrypoint
+  )
+
+  $vainfo_run_cmd = "$vainfo_app_path --display win32 --device 0 2>&1 | Select-String $entrypoint -Quiet"
+  Write-Host "Running: $vainfo_run_cmd"
+  $vainfo_ret_code= Invoke-Expression $vainfo_run_cmd
+  if (-not($vainfo_ret_code)) {
+      return 0
+  }
+  return 1
+}
+
+# Set testing environment variables
+$successful_run=1
+$testing_dir="$PWD\_install\bin" # vaon12_drv_video.dll is placed on this directory by the build
+$vainfo_app_path = "$testing_dir\vainfo.exe"
+
+# Deploy vainfo and dependencies
+Deploy-Dependencies -deploy_directory $testing_dir
+
+# Set VA runtime environment variables
+$env:LIBVA_DRIVER_NAME="vaon12"
+$env:LIBVA_DRIVERS_PATH="$testing_dir"
+
+Write-Host "LIBVA_DRIVER_NAME: $env:LIBVA_DRIVER_NAME"
+Write-Host "LIBVA_DRIVERS_PATH: $env:LIBVA_DRIVERS_PATH"
+
+# Check video processing entrypoint is supported
+# Inbox WARP/D3D12 supports this entrypoint with VA frontend shaders support (e.g no video APIs support required)
+$entrypoint = "VAEntrypointVideoProc"
+
+# First run without app verifier
+Write-Host "Disabling appverifier for $vainfo_app_path and checking for the presence of $entrypoint supported..."
+appverif.exe /disable * -for "$vainfo_app_path"
+$result_without_appverifier = Check-VAInfo-Entrypoint -vainfo_app_path $vainfo_app_path -entrypoint $entrypoint
+if ($result_without_appverifier -eq 1) {
+  Write-Host "Process exited successfully."
+} else {
+  $successful_run=0
+  Write-Error "Process exit not successful for $vainfo_run_cmd. Please see vainfo verbose output below for diagnostics..."
+  # verbose run to print more info on error (helpful to investigate issues from the CI output)
+  Invoke-Expression "$vainfo_app_path -a --display win32 --device help"
+  Invoke-Expression "$vainfo_app_path -a --display win32 --device 0"
+}
+
+# Enable appverif and run again
+Write-Host "Enabling appverifier for $vainfo_app_path and checking for the presence of $entrypoint supported..."
+appverif.exe /logtofile enable
+appverif.exe /verify "$vainfo_app_path"
+appverif.exe /enable "Leak" -for "$vainfo_app_path"
+$verifier_log_path="$testing_dir\vainfo_appverif_log.xml"
+$result_with_appverifier = Check-VAInfo-Entrypoint -vainfo_app_path $vainfo_app_path -entrypoint $entrypoint
+if ($result_with_appverifier -eq 1) {
+  Write-Host "Process exited successfully."
+  appverif.exe /logtofile disable
+} else {
+  Write-Host "Process failed. Please see Application Verifier log contents below."
+  # Need to wait for appverif to exit before gathering log
+  Start-Process -Wait -FilePath "appverif.exe" -ArgumentList "-export", "log", "-for", "$vainfo_app_path", "-with", "to=$verifier_log_path"
+  Get-Content $verifier_log_path
+  Write-Error "Process exit not successful for $vainfo_run_cmd."
+  appverif.exe /logtofile disable
+  $successful_run=0
+}
+
+if ($successful_run -ne 1) {
+  Exit 1
+}
+

.mr-label-maker.yml

@@ -88,7 +88,7 @@ issues:
         'bisected': 'bisected'
         'coverity': 'coverity'
         'deqp': 'deqp'
-        'feature request': 'feature_request'
+        'feature request': 'feature request'
         'haiku' : 'haiku'
         'regression': 'regression'
 
@@ -113,8 +113,11 @@ merge_requests:
     paths:
         '^.gitlab/issue_templates/' : ['docs']
         '^.gitlab-ci' : ['CI']
-        '^.*/gitlab-ci.yml' : ['CI']
-        '^.*/ci/' : ['CI']
+        '^.*/gitlab-ci(-inc)?.yml' : ['CI']
+        '^.*/ci/deqp-.*\.toml' : ['CI']
+        '^.*/ci/.*-(fails|flakes|skips)\.txt' : ['CI']
+        '^.*/ci/(restricted-)?traces-.*\.yml' : ['CI']
+        '^.*/ci/.*-validation-settings\.txt' : ['CI']
         '^.gitlab-ci/windows/' : ['Windows']
         '^bin/__init__.py$' : ['maintainer-scripts']
         '^bin/gen_release_notes' : ['maintainer-scripts']

VERSION

@@ -1 +1 @@
-24.1.0-devel
+24.1.2

bin/ci/ci_run_n_monitor.py

@@ -289,7 +289,8 @@ def parse_args() -> None:
     parser.add_argument(
         "--target",
         metavar="target-job",
-        help="Target job regex. For multiple targets, separate with pipe | character",
+        help="Target job regex. For multiple targets, pass multiple values, "
+             "eg. `--target foo bar`.",
         required=True,
         nargs=argparse.ONE_OR_MORE,
     )

build-support/tsan-blacklist.txt

@@ -0,0 +1,26 @@
+# For performance reasons we don't use a lock here and reading
+# a stale value is of no consequence
+fun:util_queue_fence_is_signalled
+# We also have to blacklist this function, because otherwise tsan will
+# still report the unlocked read above
+fun:util_queue_fence_signal
+
+# lavapipe:
+# Same as above for perf reasons the fence signal value is is read without
+# lock
+fun:lp_fence_signalled
+fun:lp_fence_signal
+
+# gallium/tc
+# Keeping track of tc->last_completed is an optimization and it is of no
+# consequence to read a stale value there, so surpress the warning about the
+# race condition
+fun:tc_batch_execute
+
+# This is a debug feature and ATM it is simpler to surpress the race warning
+fun:tc_set_driver_thread
+
+# vulkan/runtime
+# Even with the data race the returned value is always the same
+fun:get_max_abs_timeout_ns
+

docs/_static/specs/EGL_MESA_x11_native_visual_id.txt

@@ -0,0 +1,80 @@
+Name
+
+    MESA_x11_native_visual_id
+
+Name Strings
+
+    EGL_MESA_x11_native_visual_id
+
+Contact
+
+    Eric Engestrom <eric@engestrom.ch>
+
+Status
+
+    Complete, shipping.
+
+Version
+
+    Version 2, May 10, 2024
+
+Number
+
+    EGL Extension #TBD
+
+Extension Type
+
+    EGL display extension
+
+Dependencies
+
+    None.  This extension is written against the
+    wording of the EGL 1.5 specification.
+
+Overview
+
+    This extension allows EGL_NATIVE_VISUAL_ID to be used in
+    eglChooseConfig() for a display of type EGL_PLATFORM_X11_EXT.
+
+IP Status
+
+    Open-source; freely implementable.
+
+New Types
+
+    None
+
+New Procedures and Functions
+
+    None
+
+New Tokens
+
+    None
+
+In section 3.4.1.1 "Selection of EGLConfigs" of the EGL 1.5
+Specification, replace:
+
+    If EGL_MAX_PBUFFER_WIDTH, EGL_MAX_PBUFFER_HEIGHT,
+    EGL_MAX_PBUFFER_PIXELS, or EGL_NATIVE_VISUAL_ID are specified in
+    attrib list, then they are ignored [...]
+
+with:
+
+    If EGL_MAX_PBUFFER_WIDTH, EGL_MAX_PBUFFER_HEIGHT,
+    or EGL_MAX_PBUFFER_PIXELS are specified in attrib list, then they
+    are ignored [...]. EGL_NATIVE_VISUAL_ID is ignored except on
+    a display of type EGL_PLATFORM_X11_EXT when EGL_ALPHA_SIZE is
+    greater than zero.
+
+Issues
+
+    None.
+
+Revision History
+
+    Version 1, March 27, 2024 (Eric Engestrom)
+        Initial draft
+    Version 2, May 10, 2024 (David Heidelberg)
+	add EGL_ALPHA_SIZE condition
+	add Extension type and set it to display extension

docs/android.rst

@@ -33,8 +33,8 @@ Then, create your Meson cross file to use it, something like this
     pkgconfig = ['env', 'PKG_CONFIG_LIBDIR=NDKDIR/pkgconfig', '/usr/bin/pkg-config']
 
     [host_machine]
-    system = 'linux'
-    cpu_family = 'arm'
+    system = 'android'
+    cpu_family = 'aarch64'
     cpu = 'armv8'
     endian = 'little'
 
@@ -66,6 +66,7 @@ driver development, we need to unlock the device and remount
     adb disable-verity
     adb reboot
     adb remount -R
+    adb remount
 
 Now you can replace drivers as in:
 
@@ -74,8 +75,13 @@ Now you can replace drivers as in:
     adb push build-android-aarch64/src/freedreno/vulkan/libvulkan_freedreno.so /vendor/lib64/hw/vulkan.sdm710.so
 
 Note this command doesn't quite work because libvulkan wants the
-SONAME to match.  For now, in turnip we have been using a hack to the
-meson.build to change the SONAME.
+SONAME to match. You can use ``patchelf`` to fix this:
+
+.. code-block:: sh
+
+   cp build-android-aarch64/src/freedreno/vulkan/libvulkan_freedreno.so /tmp/vulkan.sdm710.so
+   patchelf --set-soname vulkan.sdm710.so /tmp/vulkan.sdm710.so
+   adb push /tmp/vulkan.sdm710.so /vendor/lib64/hw/
 
 Replacing Android drivers on Chrome OS
 --------------------------------------

docs/ci/index.rst

@@ -305,6 +305,12 @@ The ``--target`` argument takes a regex that you can use to select the
 jobs names you want to run, eg. ``--target 'zink.*'`` will run all the
 zink jobs, leaving the other drivers' jobs free for others to use.
 
+Note that in fork pipelines, GitLab only adds the jobs for the files that have
+changed **since the last push**, so you might not get the jobs you expect.
+You can work around that by adding a dummy change in a file core to what you're
+working on and then making a new push with that change, and removing that change
+before you create the MR.
+
 Conformance Tests
 -----------------
 

docs/drivers/anv.rst

@@ -7,26 +7,37 @@ Debugging
 Here are a few environment variable debug environment variables
 specific to ANV:
 
-:envvar:`ANV_ENABLE_PIPELINE_CACHE`
+.. envvar:: ANV_ENABLE_PIPELINE_CACHE
+
    If defined to ``0`` or ``false``, this will disable pipeline
    caching, forcing ANV to reparse and recompile any VkShaderModule
    (SPIRV) it is given.
-:envvar:`ANV_DISABLE_SECONDARY_CMD_BUFFER_CALLS`
+
+.. envvar:: ANV_DISABLE_SECONDARY_CMD_BUFFER_CALLS
+
    If defined to ``1`` or ``true``, this will prevent usage of self
    modifying command buffers to implement ``vkCmdExecuteCommands``. As
    a result of this, it will also disable :ext:`VK_KHR_performance_query`.
-:envvar:`ANV_ALWAYS_BINDLESS`
+
+.. envvar:: ANV_ALWAYS_BINDLESS
+
    If defined to ``1`` or ``true``, this forces all descriptor sets to
    use the internal `Bindless model`_.
-:envvar:`ANV_QUEUE_THREAD_DISABLE`
+
+.. envvar:: ANV_QUEUE_THREAD_DISABLE
+
    If defined to ``1`` or ``true``, this disables support for timeline
    semaphores.
-:envvar:`ANV_USERSPACE_RELOCS`
+
+.. envvar:: ANV_USERSPACE_RELOCS
+
    If defined to ``1`` or ``true``, this forces ANV to always do
    kernel relocations in command buffers. This should only have an
    effect on hardware that doesn't support soft-pinning (Ivybridge,
    Haswell, Cherryview).
-:envvar:`ANV_PRIMITIVE_REPLICATION_MAX_VIEWS`
+
+.. envvar:: ANV_PRIMITIVE_REPLICATION_MAX_VIEWS
+
    Specifies up to how many view shaders can be lowered to handle
    :ext:`VK_KHR_multiview`. Beyond this number, multiview is implemented
    using instanced rendering. If unspecified, the value default to

docs/drivers/asahi.rst

@@ -361,3 +361,7 @@ concepts used in PowerVR GPUs appear in AGX.
    Pixel BackEnd
       Hardware unit which writes to color attachements and images. Also the
       name for a descriptor passed to :term:`PBE` instructions.
+
+   UVS
+   Unified Vertex Store
+      Hardware unit which buffers the outputs of the vertex shader (varyings).

docs/drivers/freedreno.rst

@@ -406,7 +406,8 @@ capture from inside Mesa. Different ``FD_RD_DUMP`` options are available:
   until disabled. Writing 0 (or any other value) will disable dumps.
 
 Output dump files and trigger file (when enabled) are hard-coded to be placed
-under ``/tmp``, or ``/data/local/tmp`` under Android.
+under ``/tmp``, or ``/data/local/tmp`` under Android. `FD_RD_DUMP_TESTNAME` can
+be used to specify a more descriptive prefix for the output or trigger files.
 
 Functionality is generic to any Freedreno-based backend, but is currently only
 integrated in the MSM backend of Turnip. Using the existing ``TU_DEBUG=rd``
@@ -431,7 +432,7 @@ The format of hangrd is the same as in ordinary command stream capture.
 Replaying Command Stream
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-`replay` tool allows capturing and replaying ``rd`` to reproduce GPU faults.
+``replay`` tool allows capturing and replaying ``rd`` to reproduce GPU faults.
 Especially useful for transient GPU issues since it has much higher chances to
 reproduce them.
 
@@ -440,7 +441,7 @@ Dumping rendering results or even just memory is currently unsupported.
 - Replaying command streams requires kernel with ``MSM_INFO_SET_IOVA`` support.
 - Requires ``rd`` capture to have full snapshots of the memory (``rd_full`` is enabled).
 
-Replaying is done via `replay` tool:
+Replaying is done via ``replay`` tool:
 
 .. code-block:: sh
 
@@ -454,7 +455,7 @@ More examples:
 
 .. code-block:: sh
 
-  ./replay --override=0 --generator=./generate_rd test_replay.rd
+  ./replay --override=0 test_replay.rd
 
 Editing Command Stream (a6xx+)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -467,7 +468,7 @@ Given the address space bounds the generated program creates a new ``rd`` which
 could be used to override cmdstream with 'replay'. Generated ``rd`` is not replayable
 on its own and depends on buffers provided by the source ``rd``.
 
-C source could be compiled using rdcompiler-meson.build as an example.
+C source could be compiled by putting it into src/freedreno/decode/generate-rd.cc.
 
 The workflow would look like this:
 
@@ -476,15 +477,15 @@ The workflow would look like this:
 
 .. code-block:: sh
 
-  ./rddecompiler -s %cmd_stream_n% example.rd > generate_rd.c
+  ./rddecompiler -s %cmd_stream_n% example.rd > src/freedreno/decode/generate-rd.cc
 
-3. Edit the command stream;
-4. Compile it back, see rdcompiler-meson.build for the instructions;
+3. Edit the command stream;;
+4. Compile and deploy freedreno tools;
 5. Plug the generator into cmdstream replay:
 
 .. code-block:: sh
 
-  ./replay --override=%cmd_stream_№% --generator=~/generate_rd
+  ./replay --override=%cmd_stream_№%
 
 6. Repeat 3-5.
 
@@ -629,9 +630,9 @@ the cases where stale data is read.
   ``renderpass``
     stomp registers before each renderpass.
   ``inverse``
-    changes `TU_DEBUG_STALE_REGS_RANGE` meaning to
+    changes ``TU_DEBUG_STALE_REGS_RANGE`` meaning to
     "regs that should NOT be stomped".
 
 The best way to pinpoint the reg which causes a failure is to bisect the regs
 range. In case when a fail is caused by combination of several registers
-the `inverse` flag may be set to find the reg which prevents the failure.
+the ``inverse`` flag may be set to find the reg which prevents the failure.

docs/drivers/nvk.rst

@@ -27,7 +27,8 @@ Debugging
 Here are a few environment variable debug environment variables
 specific to NVK:
 
-:envvar:`NAK_DEBUG`:
+.. envvar:: NAK_DEBUG
+
    a comma-separated list of named flags affecting the NVK back-end shader
    compiler:
 
@@ -42,7 +43,8 @@ specific to NVK:
       Adds extra annotation instructions to the IR to track information
       from various compile passes
 
-:envvar:`NVK_DEBUG`:
+.. envvar:: NVK_DEBUG
+
    a comma-separated list of named flags, which do various things:
 
    ``push``
@@ -57,7 +59,8 @@ specific to NVK:
    ``no_cbuf``
       Disables automatic promotion of UBOs to constant buffers
 
-:envvar:`NVK_I_WANT_A_BROKEN_VULKAN_DRIVER`
+.. envvar:: NVK_I_WANT_A_BROKEN_VULKAN_DRIVER
+
    If defined to ``1`` or ``true``, this will enable enumeration of all
    GPUs Kepler and later, including GPUs for which hardware support is
    poorly tested or completely broken.  This is intended for developer use

docs/drivers/svga3d.rst

@@ -122,7 +122,7 @@ Building the Code
    ::
 
       cd $TOP/mesa
-      meson builddir -Dvulkan-drivers= -Dgallium-drivers=svga -Ddri-drivers= -Dglvnd=true -Dglvnd-vendor-name=mesa
+      meson builddir -Dvulkan-drivers= -Dgallium-drivers=svga -Ddri-drivers= -Dglvnd=enabled -Dglvnd-vendor-name=mesa
 
       meson compile -C builddir
       sudo meson install -C builddir

docs/drivers/venus.rst

@@ -65,14 +65,14 @@ In another shell,
 
 .. code-block:: sh
 
-    $ export VK_ICD_FILENAMES=<path-to-virtio_icd.x86_64.json>
+    $ export VK_DRIVER_FILES=<path-to-virtio_icd.x86_64.json>
     $ export VN_DEBUG=vtest
     $ vulkaninfo
     $ vkcube
 
 If the host driver of the system is not new enough, it is a good idea to build
 the host driver as well when building the Venus driver.  Just remember to set
-:envvar:`VK_ICD_FILENAMES` when starting the vtest server so that the vtest
+:envvar:`VK_DRIVER_FILES` when starting the vtest server so that the vtest
 server finds the locally built host driver.
 
 Virtio-GPU
@@ -99,7 +99,7 @@ This is how one might want to start crosvm
 
 .. code-block:: sh
 
- $ sudo LD_LIBRARY_PATH=<...> VK_ICD_FILENAMES=<...> ./target/debug/crosvm run \
+ $ sudo LD_LIBRARY_PATH=<...> VK_DRIVER_FILES=<...> ./target/debug/crosvm run \
        --gpu vulkan=true \
        --gpu-render-server path=<path-to-virglrenderer>/out/server/virgl_render_server \
        --display-window-keyboard \

docs/drivers/zink.rst

@@ -328,10 +328,20 @@ Another useful tool for debugging is the `Vulkan Validation Layers
 
 The validation layers effectively insert extra checking between Zink and the
 Vulkan driver, pointing out incorrect usage of the Vulkan API. The layers can
-be enabled by setting the environment variable :envvar:`VK_INSTANCE_LAYERS` to
-"VK_LAYER_KHRONOS_validation". You can read more about the Validation Layers
+be enabled by setting the environment variable :envvar:`VK_LOADER_LAYERS_ENABLE` to
+``VK_LAYER_KHRONOS_validation``. You can read more about the Validation Layers
 in the link above.
 
+Apple macOS and MoltenVK
+------------------------
+
+Zink on macOS is experimental with very limited capabilities.
+The Vulkan SDK (1.3.250 or newer) is required to build Zink.
+Set the build option ``-Dmoltenvk-dir=<directory>`` to point at your Vulkan SDK install or MoltenVK build.
+Add Zink to the Gallium drivers build option ``-Dgallium-drivers=zink``.
+If installed using ``brew``, you can set ``-D moltenvk-dir=$(brew --prefix molten-vk)``.
+
+
 IRC
 ---
 

docs/egl.rst

@@ -1,7 +1,7 @@
 EGL
 ===
 
-The current version of EGL in Mesa implements EGL 1.4. More information
+The current version of EGL in Mesa implements EGL 1.5. More information
 about EGL can be found at https://www.khronos.org/egl/.
 
 The Mesa's implementation of EGL uses a driver architecture. The main
@@ -26,10 +26,9 @@ Build EGL
               -D gles2=enabled \
               -D gallium-drivers=...
 
-   The main library and OpenGL is enabled by default. The first two
-   options above enables :doc:`OpenGL ES 1.x and 2.x <opengles>`. The
-   last two options enables the listed classic and Gallium drivers
-   respectively.
+   The main EGL library and OpenGL are enabled by default. The two
+   ``gles*`` options after enable :doc:`OpenGL ES 1.x and 2.x+
+   <opengles>`. The last option enables the listed Gallium drivers.
 
 #. Build and install Mesa as usual.
 

docs/envvars.rst

@@ -38,6 +38,22 @@ LibGL environment variables
 
    disable DRI3 if set to ``true``.
 
+.. envvar:: LIBGL_KOPPER_DISABLE
+
+   disable vulkan swapchains with zink if set to ``true``.
+   In general, this should not be used unless you know what you are
+   doing. Some examples of "knowing what you are doing" include:
+   - using a VK driver which has no WSI implementation for your display server
+   - profiling the DRI frontend against your VK driver's WSI implementation
+
+.. envvar:: LIBGL_KOPPER_DRI2
+
+   disable DRI3 with zink if set to ``true``.
+   In general, this should not be used unless you know what you are
+   doing. Some examples of "knowing what you are doing" include:
+   - running xrdp
+   - using a VK driver which doesn't support modifiers
+
 Core Mesa environment variables
 -------------------------------
 
@@ -222,7 +238,7 @@ Core Mesa environment variables
    referencing both the cache DB and its index file. E.g.
    ``MESA_DISK_CACHE_SINGLE_FILE=filename1`` refers to ``filename1.foz``
    and ``filename1_idx.foz``. A limit of 8 DBs can be loaded and this limit
-   is shared with :envvar:`MESA_DISK_CACHE_READ_ONLY_FOZ_DBS_DYNAMIC_LIST.`
+   is shared with :envvar:`MESA_DISK_CACHE_READ_ONLY_FOZ_DBS_DYNAMIC_LIST`.
 
 .. envvar:: MESA_DISK_CACHE_DATABASE
 
@@ -1263,6 +1279,8 @@ RADV driver environment variables
       disable Delta Color Compression (DCC) on displayable images
    ``nodynamicbounds``
       do not check OOB access for dynamic descriptors
+   ``noeso``
+      disable VK_EXT_shader_object
    ``nofastclears``
       disable fast color/depthstencil clears
    ``nofmask``
@@ -1275,8 +1293,6 @@ RADV driver environment variables
       disable HIZ for depthstencil images
    ``noibs``
       disable directly recording command buffers in GPU-visible memory
-   ``nomemorycache``
-      disable memory shaders cache
    ``nomeshshader``
       disable mesh shader support on GFX10.3+
    ``nongg``
@@ -1364,8 +1380,6 @@ RADV driver environment variables
       enable wave64 for ray tracing shaders (GFX10-10.3)
    ``sam``
       enable optimizations to move more driver internal objects to VRAM.
-   ``shader_object``
-      enable experimental implementation of VK_EXT_shader_object
    ``transfer_queue``
       enable experimental transfer queue support (GFX9+, not yet spec compliant)
    ``video_decode``
@@ -1789,7 +1803,7 @@ PowerVR driver environment variables
 
 .. envvar:: PVR_DEBUG
 
-   A comma-separated list of debug options. Use `PVR_DEBUG=help` to
+   A comma-separated list of debug options. Use ``PVR_DEBUG=help`` to
    print a list of available options.
 
 .. envvar:: ROGUE_DEBUG
@@ -1844,3 +1858,40 @@ Freedreno driver environment variables
 
 Other Gallium drivers have their own environment variables. These may
 change frequently so the source code should be consulted for details.
+
+
+Vulkan loader environment variables
+-----------------------------------
+
+These variable are handled by `Khronos' Vulkan loader
+<https://github.com/KhronosGroup/Vulkan-Loader>`__, *not by Mesa*, but they
+are documented here as we reference them in other places in our docs.
+
+.. envvar:: VK_DRIVER_FILES
+
+   Force the loader to use the specific driver JSON files. The value contains
+   a list of delimited full path listings to driver JSON Manifest files
+   and/or paths to folders containing driver JSON files.
+
+   See `Vulkan loader docs on environment variables`_.
+
+.. envvar:: VK_LOADER_LAYERS_ENABLE
+
+    A comma-delimited list of globs to search for in known layers and used to
+    select only the layers whose layer name matches one or more of the
+    provided globs.
+    Known layers are those which are found by the loader taking into account
+    default search paths and other environment variables (like VK_LAYER_PATH).
+
+   See `Vulkan loader docs on environment variables`_.
+
+.. envvar:: VK_ICD_FILENAMES
+
+   `Deprecated`_, replaced by :envvar:`VK_DRIVER_FILES`.
+
+.. envvar:: VK_INSTANCE_LAYERS
+
+   `Deprecated`_, replaced by :envvar:`VK_LOADER_LAYERS_ENABLE`.
+
+.. _Vulkan loader docs on environment variables: https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderInterfaceArchitecture.md#table-of-debug-environment-variables
+.. _Deprecated: https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderInterfaceArchitecture.md#deprecated-environment-variables

docs/features.txt

@@ -422,7 +422,7 @@ Vulkan 1.0 -- all DONE: anv, dzn, lvp, nvk, radv, tu, v3dv, vn
 
 Vulkan 1.1 -- all DONE: anv, lvp, nvk, radv, tu, vn
 
-  VK_KHR_16bit_storage                                  DONE (anv, dzn, hasvk, lvp, nvk, radv, tu/a650, v3dv, vn)
+  VK_KHR_16bit_storage                                  DONE (anv, dzn, hasvk, lvp, nvk, radv, tu/a650+, v3dv, vn)
   VK_KHR_bind_memory2                                   DONE (anv, dzn, hasvk, lvp, nvk, pvr, radv, tu, v3dv, vn)
   VK_KHR_dedicated_allocation                           DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, v3dv, vn)
   VK_KHR_descriptor_update_template                     DONE (anv, dzn, hasvk, lvp, nvk, panvk, radv, tu, v3dv, vn)
@@ -453,13 +453,13 @@ Vulkan 1.2 -- all DONE: anv, nvk, tu, vn
   VK_KHR_create_renderpass2                             DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, v3dv, vn)
   VK_KHR_depth_stencil_resolve                          DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, v3dv, vn)
   VK_KHR_draw_indirect_count                            DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, vn)
-  VK_KHR_driver_properties                              DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, v3dv, vn)
+  VK_KHR_driver_properties                              DONE (anv, dzn, hasvk, lvp, nvk, panvk, radv, tu, v3dv, vn)
   VK_KHR_image_format_list                              DONE (anv, dzn, hasvk, lvp, nvk, pvr, radv, tu, v3dv, vn)
   VK_KHR_imageless_framebuffer                          DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, v3dv, vn)
   VK_KHR_sampler_mirror_clamp_to_edge                   DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, v3dv, vn)
   VK_KHR_separate_depth_stencil_layouts                 DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, v3dv, vn)
   VK_KHR_shader_atomic_int64                            DONE (anv, lvp, nvk, radv, vn)
-  VK_KHR_shader_float16_int8                            DONE (anv, dzn, hasvk, lvp, radv, tu, vn)
+  VK_KHR_shader_float16_int8                            DONE (anv, dzn, nvk, hasvk, lvp, radv, tu, vn)
   VK_KHR_shader_float_controls                          DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, v3dv, vn)
   VK_KHR_shader_subgroup_extended_types                 DONE (anv, hasvk, lvp, nvk, radv, tu, vn)
   VK_KHR_spirv_1_4                                      DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, v3dv, vn)
@@ -503,7 +503,7 @@ Khronos extensions that are not part of any Vulkan version:
 
   VK_KHR_acceleration_structure                         DONE (anv/gfx12.5+, lvp, radv/gfx10.3+)
   VK_KHR_android_surface                                not started
-  VK_KHR_calibrated_timestamps                          DONE (anv, radv)
+  VK_KHR_calibrated_timestamps                          DONE (anv, nvk, radv)
   VK_KHR_cooperative_matrix                             DONE (anv, radv/gfx11+)
   VK_KHR_deferred_host_operations                       DONE (anv, hasvk, lvp, radv)
   VK_KHR_display                                        DONE (anv, nvk, pvr, radv, tu, v3dv)
@@ -521,11 +521,11 @@ Khronos extensions that are not part of any Vulkan version:
   VK_KHR_get_surface_capabilities2                      DONE (anv, lvp, nvk, pvr, radv, tu, v3dv, vn)
   VK_KHR_global_priority                                DONE (anv, radv, tu)
   VK_KHR_incremental_present                            DONE (anv, hasvk, lvp, nvk, radv, tu, v3dv, vn)
-  VK_KHR_index_type_uint8                               DONE (anv, nvk, radv, tu, v3dv)
+  VK_KHR_index_type_uint8                               DONE (anv, nvk, pvr, radv, tu, v3dv)
   VK_KHR_line_rasterization                             DONE (anv, nvk, radv, tu, v3dv)
   VK_KHR_load_store_op_none                             DONE (anv, nvk, radv, tu, v3dv)
   VK_KHR_maintenance5                                   DONE (anv, lvp, nvk, radv, tu)
-  VK_KHR_maintenance6                                   DONE (anv, lvp)
+  VK_KHR_maintenance6                                   DONE (anv, lvp, nvk, radv)
   VK_KHR_performance_query                              DONE (anv, radv/gfx10.3+, tu, v3dv)
   VK_KHR_pipeline_executable_properties                 DONE (anv, nvk, hasvk, radv, tu, v3dv)
   VK_KHR_pipeline_library                               DONE (anv, lvp, nvk, radv, tu, vn)
@@ -533,17 +533,17 @@ Khronos extensions that are not part of any Vulkan version:
   VK_KHR_push_descriptor                                DONE (anv, hasvk, lvp, nvk, radv, tu, vn)
   VK_KHR_ray_query                                      DONE (anv/gfx12.5+, lvp, radv/gfx10.3+)
   VK_KHR_ray_tracing_maintenance1                       DONE (anv/gfx12.5+, radv/gfx10.3+)
-  VK_KHR_ray_tracing_pipeline                           DONE (anv/gfx12.5+, radv/gfx10.3+)
+  VK_KHR_ray_tracing_pipeline                           DONE (anv/gfx12.5+, lvp, radv/gfx10.3+)
   VK_KHR_ray_tracing_position_fetch                     DONE (anv, radv/gfx10.3+)
   VK_KHR_shader_clock                                   DONE (anv, hasvk, lvp, nvk, radv, vn)
   VK_KHR_shader_expect_assume                           DONE (anv, dzn, hasvk, lvp, nvk, panvk, pvr, radv, tu, v3dv, vn)
-  VK_KHR_shader_maximal_reconvergence                   DONE (lvp, radv)
-  VK_KHR_shader_subgroup_rotate                         DONE (anv, radv)
-  VK_KHR_shader_subgroup_uniform_control_flow           DONE (anv, hasvk, radv)
+  VK_KHR_shader_maximal_reconvergence                   DONE (anv, lvp, nvk, radv)
+  VK_KHR_shader_subgroup_rotate                         DONE (anv, nvk, radv)
+  VK_KHR_shader_subgroup_uniform_control_flow           DONE (anv, hasvk, nvk, radv)
   VK_KHR_shader_quad_control                            DONE (radv)
   VK_KHR_shared_presentable_image                       not started
   VK_KHR_surface                                        DONE (anv, dzn, hasvk, lvp, nvk, panvk, pvr, radv, tu, v3dv, vn)
-  VK_KHR_surface_protected_capabilities                 DONE (anv, lvp, nvk, radv, v3dv, vn)
+  VK_KHR_surface_protected_capabilities                 DONE (anv, lvp, nvk, radv, tu, v3dv, vn)
   VK_KHR_swapchain                                      DONE (anv, dzn, hasvk, lvp, nvk, panvk, pvr, radv, tu, v3dv, vn)
   VK_KHR_swapchain_mutable_format                       DONE (anv, hasvk, lvp, nvk, radv, tu, v3dv, vn)
   VK_KHR_vertex_attribute_divisor                       DONE (anv, nvk, radv, tu, v3dv)
@@ -558,7 +558,7 @@ Khronos extensions that are not part of any Vulkan version:
   VK_EXT_attachment_feedback_loop_layout                DONE (anv, lvp, nvk, radv, tu, v3dv, vn)
   VK_EXT_border_color_swizzle                           DONE (anv, hasvk, lvp, nvk, radv/gfx10+, tu, v3dv, vn)
   VK_EXT_buffer_device_address                          DONE (anv, hasvk, nvk, radv)
-  VK_EXT_calibrated_timestamps                          DONE (anv, hasvk, lvp, radv, vn)
+  VK_EXT_calibrated_timestamps                          DONE (anv, hasvk, nvk, lvp, radv, vn)
   VK_EXT_color_write_enable                             DONE (anv, hasvk, lvp, nvk, radv, tu, v3dv, vn)
   VK_EXT_conditional_rendering                          DONE (anv, hasvk, lvp, nvk, radv, tu, vn)
   VK_EXT_conservative_rasterization                     DONE (anv, radv, vn)
@@ -570,6 +570,7 @@ Khronos extensions that are not part of any Vulkan version:
   VK_EXT_depth_clip_enable                              DONE (anv, hasvk, lvp, nvk, radv, tu, v3dv, vn)
   VK_EXT_depth_range_unrestricted                       DONE (anv/gen20+, radv, lvp)
   VK_EXT_descriptor_buffer                              DONE (anv, lvp, radv, tu)
+  VK_EXT_device_address_binding_report                  DONE (radv)
   VK_EXT_device_fault                                   DONE (radv)
   VK_EXT_device_memory_report                           DONE (vn)
   VK_EXT_direct_mode_display                            DONE (anv, lvp, nvk, radv, tu, v3dv)
@@ -579,9 +580,9 @@ Khronos extensions that are not part of any Vulkan version:
   VK_EXT_dynamic_rendering_unused_attachments           DONE (anv, nvk, radv, vn)
   VK_EXT_extended_dynamic_state3                        DONE (anv, lvp, nvk, radv, tu, vn)
   VK_EXT_external_memory_acquire_unmodified             DONE (radv)
-  VK_EXT_external_memory_dma_buf                        DONE (anv, hasvk, nvk, pvr, radv, tu, v3dv, vn)
+  VK_EXT_external_memory_dma_buf                        DONE (anv, hasvk, lvp, nvk, pvr, radv, tu, v3dv, vn)
   VK_EXT_external_memory_host                           DONE (anv, hasvk, lvp, radv)
-  VK_EXT_filter_cubic                                   DONE (tu/a650)
+  VK_EXT_filter_cubic                                   DONE (tu/a650+)
   VK_EXT_fragment_shader_interlock                      DONE (anv, radv/gfx9+, vn)
   VK_EXT_global_priority                                DONE (anv, hasvk, radv, tu)
   VK_EXT_global_priority_query                          DONE (anv, hasvk, radv, tu)
@@ -589,10 +590,10 @@ Khronos extensions that are not part of any Vulkan version:
   VK_EXT_headless_surface                               DONE (anv, dzn, hasvk, lvp, nvk, panvk, pvr, radv, tu, v3dv, vn)
   VK_EXT_image_2d_view_of_3d                            DONE (anv, hasvk, lvp, nvk, radv, tu, vn)
   VK_EXT_image_compression_control                      DONE (radv)
-  VK_EXT_image_drm_format_modifier                      DONE (anv, hasvk, radv/gfx9+, tu, v3dv, vn)
+  VK_EXT_image_drm_format_modifier                      DONE (anv, hasvk, nvk, radv/gfx9+, tu, v3dv, vn)
   VK_EXT_image_sliced_view_of_3d                        DONE (anv, nvk, radv/gfx10+)
   VK_EXT_image_view_min_lod                             DONE (anv, hasvk, nvk, radv, tu, vn)
-  VK_EXT_index_type_uint8                               DONE (anv, hasvk, nvk, lvp, panvk, radv/gfx8+, tu, v3dv, vn)
+  VK_EXT_index_type_uint8                               DONE (anv, hasvk, nvk, lvp, panvk, pvr, radv/gfx8+, tu, v3dv, vn)
   VK_EXT_line_rasterization                             DONE (anv, hasvk, nvk, lvp, radv, tu, v3dv, vn)
   VK_EXT_load_store_op_none                             DONE (anv, nvk, radv, tu, v3dv, vn)
   VK_EXT_memory_budget                                  DONE (anv, hasvk, lvp, nvk, pvr, radv, tu, v3dv, vn)
@@ -600,44 +601,44 @@ Khronos extensions that are not part of any Vulkan version:
   VK_EXT_mesh_shader                                    DONE (anv/gfx12.5+, lvp, radv)
   VK_EXT_multi_draw                                     DONE (anv, hasvk, lvp, nvk, radv, tu, vn, v3dv)
   VK_EXT_multisampled_render_to_single_sampled          DONE (lvp)
-  VK_EXT_nested_command_buffer                          DONE (anv, lvp)
+  VK_EXT_nested_command_buffer                          DONE (anv, lvp, nvk, radv)
   VK_EXT_non_seamless_cube_map                          DONE (anv, hasvk, lvp, nvk, radv, tu, vn)
   VK_EXT_pageable_device_local_memory                   DONE (lvp)
   VK_EXT_pci_bus_info                                   DONE (anv, hasvk, nvk, radv, vn)
   VK_EXT_physical_device_drm                            DONE (anv, hasvk, nvk, radv, tu, v3dv, vn)
   VK_EXT_pipeline_library_group_handles                 DONE (anv, radv)
   VK_EXT_pipeline_robustness                            DONE (anv, radv, v3dv)
-  VK_EXT_post_depth_coverage                            DONE (anv/gfx11+, lvp, radv/gfx10+)
+  VK_EXT_post_depth_coverage                            DONE (anv/gfx11+, lvp, radv/gfx10+, tu)
   VK_EXT_primitive_topology_list_restart                DONE (anv, hasvk, lvp, nvk, radv, tu, v3dv, vn)
   VK_EXT_primitives_generated_query                     DONE (anv, hasvk, lvp, nvk, radv, tu, vn)
   VK_EXT_provoking_vertex                               DONE (anv, hasvk, lvp, nvk, radv, tu, v3dv, vn)
-  VK_EXT_queue_family_foreign                           DONE (anv, hasvk, radv, tu, vn)
+  VK_EXT_queue_family_foreign                           DONE (anv, hasvk, nvk, lvp, radv, tu, vn)
   VK_EXT_rasterization_order_attachment_access          DONE (lvp, tu, vn)
   VK_EXT_robustness2                                    DONE (anv, hasvk, lvp, nvk, radv, tu, vn)
-  VK_EXT_sample_locations                               DONE (anv, hasvk, nvk, radv/gfx9-, tu/a650)
+  VK_EXT_sample_locations                               DONE (anv, hasvk, nvk, radv/gfx9-, tu/a650+)
   VK_EXT_shader_atomic_float                            DONE (anv, hasvk, lvp, radv)
   VK_EXT_shader_atomic_float2                           DONE (anv, lvp, radv)
   VK_EXT_shader_image_atomic_int64                      DONE (nvk, radv)
-  VK_EXT_shader_object                                  DONE (lvp, nvk)
+  VK_EXT_shader_object                                  DONE (lvp, nvk, radv)
   VK_EXT_shader_stencil_export                          DONE (anv, lvp, radv, tu, vn)
   VK_EXT_shader_subgroup_ballot                         DONE (anv, dzn, hasvk, lvp, nvk, radv, vn)
   VK_EXT_shader_subgroup_vote                           DONE (anv, dzn, hasvk, lvp, nvk, radv)
   VK_EXT_shader_module_identifier                       DONE (anv, hasvk, nvk, radv, tu, v3dv)
-  VK_EXT_surface_maintenance1                           DONE (nvk, radv)
-  VK_EXT_swapchain_maintenance1                         DONE (nvk, radv)
+  VK_EXT_surface_maintenance1                           DONE (anv, lvp, nvk, radv, tu, v3dv)
+  VK_EXT_swapchain_maintenance1                         DONE (anv, lvp, nvk, radv, tu, v3dv)
   VK_EXT_transform_feedback                             DONE (anv, hasvk, lvp, nvk, radv, tu, vn)
   VK_EXT_vertex_attribute_divisor                       DONE (anv, dzn, hasvk, lvp, nvk, panvk, radv, tu, v3dv, vn)
   VK_EXT_vertex_input_dynamic_state                     DONE (anv, lvp, nvk, radv, tu, vn)
   VK_EXT_ycbcr_image_arrays                             DONE (anv, hasvk, lvp, nvk, radv)
   VK_ANDROID_external_memory_android_hardware_buffer    DONE (anv, radv, vn)
   VK_ANDROID_native_buffer                              DONE (anv, radv, tu, v3dv, vn)
-  VK_GOOGLE_decorate_string                             DONE (anv, hasvk, lvp, radv)
-  VK_GOOGLE_hlsl_functionality1                         DONE (anv, hasvk, lvp, radv)
-  VK_GOOGLE_user_type                                   DONE (anv, hasvk, radv)
-  VK_IMG_filter_cubic                                   DONE (tu/a650)
+  VK_GOOGLE_decorate_string                             DONE (anv, hasvk, lvp, nvk, radv, tu)
+  VK_GOOGLE_hlsl_functionality1                         DONE (anv, hasvk, lvp, nvk, radv, tu)
+  VK_GOOGLE_user_type                                   DONE (anv, hasvk, nvk, radv, tu)
+  VK_IMG_filter_cubic                                   DONE (tu/a650+)
   VK_NV_compute_shader_derivatives                      DONE (anv, hasvk, radv)
   VK_EXT_acquire_drm_display                            DONE (anv, nvk, radv, tu, v3dv)
-  VK_VALVE_mutable_descriptor_type                      DONE (anv, hasvk, radv, tu, vn)
+  VK_VALVE_mutable_descriptor_type                      DONE (anv, hasvk, nvk, radv, tu, vn)
   VK_AMD_buffer_marker                                  DONE (anv, radv, tu)
   VK_AMD_device_coherent_memory                         DONE (radv)
   VK_AMD_draw_indirect_count                            DONE (radv)
@@ -658,7 +659,7 @@ Khronos extensions that are not part of any Vulkan version:
   VK_AMD_texture_gather_bias_lod                        DONE (anv, radv)
   VK_ARM_rasterization_order_attachment_access          DONE (lvp, tu)
   VK_EXT_mutable_descriptor_type                        DONE (anv, lvp, nvk, radv, tu, vn)
-  VK_EXT_swapchain_colorspace                           DONE (anv, nvk, radv, tu)
+  VK_EXT_swapchain_colorspace                           DONE (anv, lvp, nvk, radv, tu, v3dv)
   VK_EXT_depth_clamp_zero_one                           DONE (anv, radv)
   VK_INTEL_shader_integer_functions2                    DONE (anv, hasvk, radv)
   VK_KHR_map_memory2                                    DONE (anv, nvk, radv, tu)

docs/gallium/context.rst

@@ -893,7 +893,7 @@ This function allows frontends to query kernel information defined inside
 get_compute_state_subgroup_size
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-This function returns the choosen subgroup size when `launch_grid` is
+This function returns the choosen subgroup size when ``launch_grid`` is
 called with the given block size. This doesn't need to be implemented when
 only one size is reported through ``PIPE_COMPUTE_CAP_SUBGROUP_SIZES`` or
 ``pipe_compute_state_object_info::simd_sizes``.

docs/gallium/screen.rst

@@ -545,7 +545,6 @@ The integer capabilities:
 * ``PIPE_CAP_DEST_SURFACE_SRGB_CONTROL``: Indicates whether the drivers
   supports switching the format between sRGB and linear for a surface that is
   used as destination in draw and blit calls.
-* ``PIPE_CAP_NIR_COMPACT_ARRAYS``: True if the compiler backend supports NIR's compact array feature, for all shader stages.
 * ``PIPE_CAP_MAX_VARYINGS``: The maximum number of fragment shader
   varyings. This will generally correspond to
   ``PIPE_SHADER_CAP_MAX_INPUTS`` for the fragment shader, but in some
@@ -805,7 +804,7 @@ pipe_screen::get_compute_param.
   non-zero means yes, zero means no. Value type: ``uint32_t``
 * ``PIPE_COMPUTE_CAP_SUBGROUP_SIZES``: Ored power of two sizes of a basic execution
   unit in threads. Also known as wavefront size, warp size or SIMD width.
-  E.g. `64 | 32`.
+  E.g. ``64 | 32``.
 * ``PIPE_COMPUTE_CAP_ADDRESS_BITS``: The default compute device address space
   size specified as an unsigned integer value in bits.
 * ``PIPE_COMPUTE_CAP_MAX_VARIABLE_THREADS_PER_BLOCK``: Maximum variable number

docs/install.rst

@@ -161,7 +161,7 @@ Vulkan
 
 .. code-block:: sh
 
-   VK_ICD_FILENAMES="$MESA_INSTALLDIR/share/vulkan/icd/my_icd.json" vulkaninfo
+   VK_DRIVER_FILES="$MESA_INSTALLDIR/share/vulkan/icd/my_icd.json" vulkaninfo
 
 where ``my_icd.json`` is replaced with the actual ICD json file name.  This
 will depend on your driver.  For instance, the 64-bit Lavapipe driver ICD file

docs/isl/ccs.rst

@@ -16,7 +16,8 @@ referring both to the *multisample control surface* used for multisample
 compression and the control surface used for fast-clears. In ISL, the
 :c:enumerator:`isl_aux_usage.ISL_AUX_USAGE_MCS` enum always refers to
 multisample color compression while the
-:c:enumerator:`isl_aux_usage.ISL_AUX_USAGE_CCS_` enums always refer to
+:c:enumerator:`isl_aux_usage.ISL_AUX_USAGE_CCS_D` and
+:c:enumerator:`isl_aux_usage.ISL_AUX_USAGE_CCS_E` enums always refer to
 single-sampled color compression. Throughout this chapter and the rest of the
 ISL documentation, we will use the term "color control surface", abbreviated
 CCS, to denote the control surface used for both fast-clears and color

docs/isl/formats.rst

@@ -32,7 +32,7 @@ The different data layouts fall into two categories: array and packed.  When an
 array layout is used, the components are stored sequentially in an array of the
 given encoding.  For instance, if the data is encoded in an 8-bit RGBA array
 format the data is stored in an array of type :c:type:`uint8_t` where the blue
-component of the `i`'th color value is accessed as:
+component of the ``i``'th color value is accessed as:
 
 .. code-block:: C
 
@@ -48,8 +48,8 @@ a standard C data type.
 Packed formats, on the other hand, are encoded with the entire color value
 packed into a single 8, 16, or 32-bit value.  The components are specified by
 which bits they occupy within that value.  For instance, with the popular
-`RGB565` format, each :c:type:`vec3` takes up 16 bits and the
-`i`'th color value is accessed as:
+``RGB565`` format, each :c:type:`vec3` takes up 16 bits and the
+``i``'th color value is accessed as:
 
 .. code-block:: C
 
@@ -58,24 +58,24 @@ which bits they occupy within that value.  For instance, with the popular
    uint8_t b = (*(uint16_t *)data >> 11) & 0x1f;
 
 Packed formats are useful because they allow you to specify formats with uneven
-component sizes such as `RGBA1010102` or where the components are
-smaller than 8 bits such as `RGB565` discussed above.  It does,
+component sizes such as ``RGBA1010102`` or where the components are
+smaller than 8 bits such as ``RGB565`` discussed above.  It does,
 however, come with the restriction that the entire vector must fit within 8,
 16, or 32 bits.
 
 One has to be careful when reasoning about packed formats because it is easy to
 get the color order wrong.  With array formats, the channel ordering is usually
-implied directly from the format name with `RGBA8888` storing the
-formats as in the first example and `BGRA8888` storing them in the BGRA
+implied directly from the format name with ``RGBA8888`` storing the
+formats as in the first example and ``BGRA8888`` storing them in the BGRA
 ordering.  Packed formats, however, are not as simple because some
 specifications choose to use a MSB to LSB ordering and others LSB to MSB.  One
 must be careful to pay attention to the enum in question in order to avoid
 getting them backwards.
 
 From an API perspective, both types of formats are available.  In Vulkan, the
-formats that are of the form :c:enumerator:`VK_FORMAT_xxx_PACKEDn` are packed
-formats where the entire color fits in `n` bits and formats without the
-`_PACKEDn` suffix are array formats.  In GL, if you specify one of the
+formats that are of the form ``VK_FORMAT_xxx_PACKEDn`` are packed
+formats where the entire color fits in ``n`` bits and formats without the
+``_PACKEDn`` suffix are array formats.  In GL, if you specify one of the
 base types such as :c:enumerator:`GL_FLOAT` you get an array format but if you
 specify a packed type such as :c:enumerator:`GL_UNSIGNED_INT_8_8_8_8_REV` you
 get a packed format.

docs/isl/units.rst

@@ -15,22 +15,22 @@ are as follows:
 These units are fundamental to ISL because they allow us to specify information
 about a surface in a canonical way that isn't dependent on hardware generation.
 Each field in an ISL data structure that stores any sort of dimension has a
-suffix that declares the units for that particular value: "`_el`" for elements,
-"`_sa`" for samples, etc.  If the units of the particular field aren't quite
+suffix that declares the units for that particular value: ``_el`` for elements,
+``_sa`` for samples, etc.  If the units of the particular field aren't quite
 what is wanted by the hardware, we do the conversion when we emit
-`RENDER_SURFACE_STATE`.
+``RENDER_SURFACE_STATE``.
 
 This is one of the primary differences between ISL and the old miptree code and
 one of the core design principles of ISL.  In the old miptree code, we tried to
 keep everything in the same units as the hardware expects but this lead to
 unnecessary complications as the hardware evolved.  One example of this
 difference is QPitch which specifies the distance between array slices.  On
-Broadwell and earlier, QPitch field in `RENDER_SURFACE_STATE` was in
+Broadwell and earlier, QPitch field in ``RENDER_SURFACE_STATE`` was in
 rows of samples.  For block-compressed images, this meant it had to be
 a multiple of the block height.  On Skylake, it changed to always being in rows
 of elements so you have to divide the pitch in samples by the compression
 block height.  Since the old surface state code tries to store things in
-hardware units, everyone who ever reads :c:expr:`brw_mipmap_tree.qpitch` has
+hardware units, everyone who ever reads ``brw_mipmap_tree.qpitch`` has
 to change their interpretation based on hardware generation and whether or not
 the surface was block-compressed.  In ISL, we have
 :c:member:`isl_surf.array_pitch_el_rows` which, as the name says, is in rows
@@ -51,11 +51,11 @@ The next unit in ISL's repertoire is **samples**.  In a multisampled surface,
 each pixel corresponds to some number of samples given by
 :c:member:`isl_surf.samples`.  The exact layout of the samples depends on
 the value of :c:member:`isl_surf.msaa_layout`.  If the layout is
-:c:enumerator:`ISL_MSAA_LAYOUT_ARRAY` then each logical array in the surface
-corresponds to :c:member:`isl_surf.samples` actual slices
+:c:enumerator:`isl_msaa_layout.ISL_MSAA_LAYOUT_ARRAY` then each logical array in
+the surface corresponds to :c:member:`isl_surf.samples` actual slices
 in the resulting surface, one per array slice.  If the layout is
-:c:enumerator:`ISL_MSAA_LAYOUT_INTERLEAVED` then each pixel corresponds to a
-2x1, 2x2, 4x2, or 4x4 grid of samples.  In order to aid in calculations, one of
+:c:enumerator:`isl_msaa_layout.ISL_MSAA_LAYOUT_INTERLEAVED` then each pixel corresponds
+to a 2x1, 2x2, 4x2, or 4x4 grid of samples.  In order to aid in calculations, one of
 the first things ISL does is to compute :c:member:`isl_surf.phys_level0_sa`
 which gives the dimensions of the base miplevel of the surface in samples.  The
 type of :c:member:`isl_surf.phys_level0_sa` is :c:struct:`isl_extent4d`

docs/macos.rst

@@ -1,10 +1,6 @@
 Notes for macOS
 ================
 
-.. image:: https://github.com/mesa3d/mesa/actions/workflows/macos.yml/badge.svg
-    :target: https://github.com/mesa3d/mesa/actions/workflows/macos.yml
-    :alt: macOS CI
-
 Mesa builds on macOS without modifications. However, there are some details to
 be aware of.
 
@@ -20,5 +16,6 @@ hardware-accelerated system OpenGL framework, to provide hardware acceleration
 to X11 applications on macOS running via XQuartz.
 
 Mesa's software rasterizers also work on macOS. To build, set the build options
-``-Dosmesa=true -Dglx=xlib`` and select an appropriate Gallium software
-rasterizer.
+``-Dosmesa=true -Dglx=xlib``.
+
+Mesa's Gallium drivers can be used on macOS by using the ``-Dgallium-drivers=<drivers>`` build option. Do not use with the previous software rasterizers options, instead add ``swrast`` to the ``<drivers>`` list. Only software renderers and drivers that forward to other APIs can work, any linux hardware drivers will not work. For details on each driver's macOS support see their specific documentation.

docs/nir/alu.rst

@@ -50,7 +50,7 @@ While most instruction types in NIR require vector sizes to perfectly match on
 inputs and outputs, ALU instruction sources have an additional
 :c:member:`nir_alu_src.swizzle` field which allows them to act on vectors
 which are not the native vector size of the instruction.  This is ideal for
-hardware with a native data type of `vec4` but also means that ALU
+hardware with a native data type of :nir:alu-op:`vec4` but also means that ALU
 instructions are often used (and required) for packing/unpacking vectors for
 use in other instruction types like intrinsics or texture ops.
 

docs/opengles.rst

@@ -1,8 +1,9 @@
 OpenGL ES
 =========
 
-Mesa implements OpenGL ES 1.1 and OpenGL ES 2.0. More information about
-OpenGL ES can be found at https://www.khronos.org/opengles/.
+Mesa implements OpenGL ES 1.1, 2.0, 3.0, 3.1 and 3.2, although some drivers
+may expose lower limited set. More information about OpenGL ES can be found at
+https://www.khronos.org/opengles/.
 
 OpenGL ES depends on a working EGL implementation. Please refer to
 :doc:`Mesa EGL <egl>` for more information about EGL.

docs/release-calendar.csv

@@ -1,7 +1,4 @@
-24.0,2024-03-13,24.0.3,Eric Engestrom
-,2024-03-27,24.0.4,Eric Engestrom
-,2024-04-10,24.0.5,Eric Engestrom
-,2024-04-24,24.0.6,Eric Engestrom
+24.0,2024-04-24,24.0.6,Eric Engestrom
 ,2024-05-08,24.0.7,Eric Engestrom
 24.1,2024-04-24,24.1.0-rc1,Eric Engestrom,24.1 branchpoint
 ,2024-05-01,24.1.0-rc2,Eric Engestrom

docs/releasing.rst

@@ -286,9 +286,9 @@ Here is one solution:
    unset LIBGL_DEBUG
    unset LIBGL_ALWAYS_SOFTWARE
    unset GALLIUM_DRIVER
-   export VK_ICD_FILENAMES=`pwd`/test/usr/local/share/vulkan/icd.d/intel_icd.x86_64.json
+   export VK_DRIVER_FILES=`pwd`/test/usr/local/share/vulkan/icd.d/intel_icd.x86_64.json
    steam steam://rungameid/570  -vconsole -vulkan
-   unset VK_ICD_FILENAMES
+   unset VK_DRIVER_FILES
 
 Create release notes for the new release
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

docs/relnotes.rst

@@ -3,6 +3,11 @@ Release Notes
 
 The release notes summarize what's new or changed in each Mesa release.
 
+-  :doc:`24.1.2 release notes <relnotes/24.1.2>`
+-  :doc:`24.1.1 release notes <relnotes/24.1.1>`
+-  :doc:`24.1.0 release notes <relnotes/24.1.0>`
+-  :doc:`24.0.5 release notes <relnotes/24.0.5>`
+-  :doc:`24.0.4 release notes <relnotes/24.0.4>`
 -  :doc:`24.0.3 release notes <relnotes/24.0.3>`
 -  :doc:`24.0.2 release notes <relnotes/24.0.2>`
 -  :doc:`23.3.6 release notes <relnotes/23.3.6>`
@@ -414,6 +419,11 @@ The release notes summarize what's new or changed in each Mesa release.
    :maxdepth: 1
    :hidden:
 
+   24.1.2 <relnotes/24.1.2>
+   24.1.1 <relnotes/24.1.1>
+   24.1.0 <relnotes/24.1.0>
+   24.0.5 <relnotes/24.0.5>
+   24.0.4 <relnotes/24.0.4>
    24.0.3 <relnotes/24.0.3>
    24.0.2 <relnotes/24.0.2>
    23.3.6 <relnotes/23.3.6>

docs/relnotes/24.0.4.rst

@@ -0,0 +1,220 @@
+Mesa 24.0.4 Release Notes / 2024-03-27
+======================================
+
+Mesa 24.0.4 is a bug fix release which fixes bugs found since the 24.0.3 release.
+
+Mesa 24.0.4 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 24.0.4 implements the Vulkan 1.3 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    90febd30a098cbcd97ff62ecc3dcf5c93d76f7fa314de944cfce81951ba745f0  mesa-24.0.4.tar.xz
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- nvk: dota 2 crashes after ~5 seconds in game
+- VAAPI: Incorrect HEVC block size reported with radeonsi
+- radv: WWE 2K24 has very quirky DCC issues on RDNA2
+- RUSTICL creating a shared reference to mutable static is discouraged and will become a hard error
+- KiCAD 3D Viewer - rounded pads rendered incorrectly (texture mapping or stencil test error)
+- OpenSCAD rendering incorrect and inconsistent on radeonsi
+- [radv] Half-Life Alyx renders solid black for reflective surfaces
+- [RX 7900 XTX] Helldivers 2 cause GPU reset
+- radeon: Crash in radeon_bo_can_reclaim_slab
+- RV530 renders improperly at non 4:3 resolutions.
+- anv: new cooperative matrix failures with CTS 1.3.8.0
+- \`[gfxhub0] no-retry page fault` triggered by \`AMD_TEST=testdmaperf` on gfx90c APU
+
+
+Changes
+-------
+
+Boris Brezillon (1):
+
+- panvk: Disable global offset on varying and non-VS attribute descriptors
+
+Caio Oliveira (2):
+
+- intel/brw: Use helper to create accumulator register
+- intel/brw: Fix validation of accumulator register
+
+Charlie Turner (1):
+
+- {vulkan,radv,anv}/video: fix issue in H264 scaling lists derivation
+
+Corentin Noël (2):
+
+- st_pbo/compute: Use the correct structure type when allocating a specialized key
+- zink: Make sure to initialize all the fields of VkMemoryBarrier
+
+Dave Airlie (1):
+
+- radv/video: fix h265 decode with unaligned w/h
+
+David Rosca (1):
+
+- radv/video: Set maxActiveReferencePictures to 16 for H264/5
+
+Eric Engestrom (5):
+
+- docs: add sha256sum for 24.0.3
+- .pick_status.json: Update to 9b6d6c1d2d0c8a517e974abbf7b75a47a607f6ec
+- .pick_status.json: Update to eac703f69128d5aa6879c9becbad627ce08a7920
+- .pick_status.json: Update to 912e203a534be8b70b3ef8bf00294e9c962e385a
+- .pick_status.json: Update to c0875d21563257442fd91aab5740248b0fd96a5c
+
+Faith Ekstrand (2):
+
+- nir/builder: Correctly handle decl_reg or undef as the first instruction
+- nir/gather_types: Support unstructured control-flow
+
+Francisco Jerez (1):
+
+- intel/eu/xe2+: Translate brw_reg fields in REG_SIZE units to physical 512b GRF units during codegen.
+
+Friedrich Vock (2):
+
+- radv: Only enable SEs that the device reports
+- radeonsi: Only enable SEs that the device reports
+
+Gert Wollny (2):
+
+- nir-to-spirv: Cast SSBO input pointer when needed
+- nir_to_spirv: Allow LOD for external images
+
+Hyunjun Ko (1):
+
+- anv/video: fix scan order for scaling lists on H265 decoding.
+
+Iván Briano (2):
+
+- compiler/types: fix serialization of cooperative matrix
+- intel/cmat: fix stride calculation in cmat load/store
+
+Jordan Justen (1):
+
+- intel/compiler/fs: Restore SIMD32 restriction for ray_queries on Xe2
+
+Karol Herbst (2):
+
+- rusticl/kernel: assign sampler locations before DCEing variables
+- nouveau: call glsl_type_singleton_init_or_ref earlier
+
+Kenneth Graunke (1):
+
+- intel/brw: Fix opt_split_sends() to allow for FIXED_GRF send sources
+
+Konstantin Seurer (1):
+
+- zink: Handle aoa derefs of images
+
+Lionel Landwerlin (6):
+
+- intel/fs: fixup sampler header message
+- anv: return unsupported for FSR images on Gfx12.0
+- anv: ignore descriptor alignment for inline uniforms
+- blorp: handle a few allocation failure cases
+- anv: fix block pool allocation failure
+- anv: fix bitfield checks in gfx runtime flushing
+
+Lucas Stach (1):
+
+- etnaviv: fix fixpoint conversion of negative values
+
+Marek Olšák (8):
+
+- amd/registers: add correct gfx11.x enums for BINNING_MODE
+- radeonsi: disable binning correctly on gfx11.5
+- radeonsi/gfx11: fix programming of PA_SC_BINNER_CNTL_1.MAX_ALLOC_COUNT
+- radeonsi/gfx10.3: add a GPU hang workaround for legacy tess+GS
+- radeonsi/gfx11: add missing DCC_RD_POLICY setting
+- ac/llvm: fix SSBO bounds checking by using raw instead of struct opcodes
+- radeonsi: fix the DMA compute shader
+- r300: port scanout pitch alignment from the DDX to fix DRI3
+
+Mary Guillemard (1):
+
+- nvk: Always copy conditional rendering value before compare
+
+Matthew Waters (1):
+
+- teximage: allow glCopyTex{Sub}Image[123]D into R/RG textures with OpenGL ES 2.0
+
+Mike Blumenkrantz (13):
+
+- zink: destroy batch states after copy context
+- mesa: force rendertarget usage on required-renderable formats
+- zink: try getting sparse page size again without storage bit on fail
+- zink: set the sparse format usage flags directly based on queried props
+- zink: rename optimal_key in update_gfx_program_optimal()
+- zink: use the sanitized key in update_gfx_program_optimal()
+- zink: always sync and replace separable progs even with ZINK_DEBUG=noopt
+- zink: add even more strict checks for separate shader usage
+- glx: only print zink failure-to-load messages if explicitly requested
+- zink: iterate all the modes when doing separate shader fixups
+- zink: do io fixup on patch variables too
+- zink: defer present barrier to flush if a clear is pending
+- zink: clamp swapchain renderarea instead of asserting
+
+Patrick Lerda (1):
+
+- ac/llvm,radeonsi: fix memory leaks triggered by ac_nir_translate() errors
+
+Paulo Zanoni (1):
+
+- anv: don't leak device->vma_samplers
+
+Philipp Zabel (1):
+
+- rusticl: work around reference-to-mutable-static warnings
+
+Pierre-Eric Pelloux-Prayer (2):
+
+- winsys/radeon: pass priv instead NULL to radeon_bo_can_reclaim
+- radeonsi: preserve alpha if needed in kill_ps_outputs_cb
+
+Rhys Perry (4):
+
+- aco: don't reuse misaligned attribute destination VGPRs in VS prologs
+- radv: use dual_color_blend_by_location with Half-Life Alyx
+- aco/cssa: reset equal_anc_out if merging fails
+- aco/gfx11: fix scratch ST mode assembly
+
+Ruijing Dong (3):
+
+- radeonsi/vcn: add enc surface alignment caps
+- frontends/va: add surface alignment attribute
+- radeonsi/vcn: update to use correct padding size.
+
+Samuel Pitoiset (7):
+
+- ac/nir: fix exporting NGG streamout outputs with implicit PrimId from VS/TES
+- radv: disable binning correctly on GFX11.5
+- radv: fix programming of PA_SC_BINNER_CNTL_1.MAX_ALLOC_COUNT on GFX11
+- radv: fix occlusion queries with MSAA and no attachments
+- radv: add radv_force_pstate_peak_gfx11_dgpu and enable it for Helldivers 2
+- radv: add a workaround for null IBO on GFX6
+- radv: invalidate L2 metadata for VK_ACCESS_2_MEMORY_READ_BIT
+
+Yusuf Khan (1):
+
+- nvk: fix valve segfault from setting a descriptor set from NULL

docs/relnotes/24.0.5.rst

@@ -0,0 +1,212 @@
+Mesa 24.0.5 Release Notes / 2024-04-10
+======================================
+
+Mesa 24.0.5 is a bug fix release which fixes bugs found since the 24.0.4 release.
+
+Mesa 24.0.5 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 24.0.5 implements the Vulkan 1.3 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    38cc245ca8faa3c69da6d2687f8906377001f63365348a62cc6f7fafb1e8c018  mesa-24.0.5.tar.xz
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- anv: vkd3d-proton test_stress_suballocation failure
+- d3d12: Zwift renders with bad textures/lighting
+- NVK: Misrendering with Civilization 6
+- radv: RDR2 might need zerovram
+- Issues rendering gtk4 window decorations on v3d on Fedora-40/mesa-24.0
+- clc: Failure when linking with llvm+clang 18.1 (-Dshared-llvm=disabled)
+- LLVM-18 build issue
+
+
+Changes
+-------
+
+Axel Davy (5):
+
+- frontend/nine: Fix ff ps key
+- frontend/nine: Fix programmable vs check
+- frontend/nine: Fix missing light flag check
+- frontend/nine: Fix destruction race
+- frontend/nine: Reset should EndScene
+
+Connor Abbott (2):
+
+- freedreno/a7xx: Add CP_CCHE_INVALIDATE
+- tu: Implement CCHE invalidation
+
+Dave Airlie (1):
+
+- mesa: reorder st context teardown
+
+David Heidelberg (7):
+
+- r300: add missing licence to the r300_public.h
+- r300: add missing copyright header
+- docs: we support EGL 1.5 for a long time
+- ci/amd: drop old PIGLIT_REPLAY_DESCRIPTION_FILE surpassed by PIGLIT_TRACES_FILE
+- r600: add license header to r600_formats.h
+- r600: add license info to the r600_opcodes.h
+- r600: add license information to the sfn_shader_gs.h
+
+David Stern (1):
+
+- vulkan/wsi/x11: Explicitly discard errors from xcb_present_pixmap.
+
+Eric Engestrom (5):
+
+- docs: add sha256sum for 24.0.4
+- .pick_status.json: Update to 3d68dd78d07b30cefe90d76af681075f4ed6b33d
+- .pick_status.json: Update to fcb568a5d5a52db75fa2f6d04579bb404ca7f597
+- .pick_status.json: Update to 078fe5454e97d073feb18bcdcf7ed1874e8b4835
+- .pick_status.json: Update to 2c1cb65949933a05eedb2eacc15cd893ecaef8aa
+
+Eric R. Smith (2):
+
+- panfrost: mark indirect compute buffer as read
+- gallium: handle copy_image of depth textures
+
+Faith Ekstrand (2):
+
+- nvk: Add a _pad field to nvk_cbuf
+- nvk: Add a _pad field to nvk_fs_key
+
+Georg Lehmann (2):
+
+- aco: don't combine mul+add_clamp to mad_clamp
+- aco/ra: use SDWA for 16bit instructions when the second byte is blocked
+
+Iago Toral Quiroga (2):
+
+- v3d: implement fix for GFXH-1602
+- broadcom/compiler: fix workaround for GFXH-1602
+
+Ian Romanick (3):
+
+- intel/brw: Clear write_accumulator flag when changing the destination
+- intel/brw: Use enums for DPAS source regioning
+- nir: intel/brw: Change the order of sources for nir_dpas_intel
+
+Jesse Natalie (1):
+
+- glsl: Use a stable attr sort for VS in / FS out
+
+Jordan Justen (1):
+
+- intel/dev: Add 0x56be and 0x56bf DG2 PCI IDs
+
+José Roberto de Souza (4):
+
+- anv: Fix calculation of syncs required in Xe KMD
+- iris: Wait for drm_xe_exec_queue to be idle before destroying it
+- anv: Create protected engine context when i915 supports vm control
+- intel: Enable Xe KMD support by default
+
+Juston Li (1):
+
+- Revert "zink: store last pipeline directly for zink_gfx_program::last_pipeline"
+
+Karol Herbst (1):
+
+- meson: fix link failure with llvm-18
+
+Kenneth Graunke (2):
+
+- intel/brw: Fix generate_mov_indirect to check has_64bit_int not float
+- intel/brw: Fix lower_regioning for BROADCAST, MOV_INDIRECT on Q types
+
+Konstantin Seurer (1):
+
+- nir/serialize: Encode data for temporaries
+
+Lionel Landwerlin (7):
+
+- anv: fix protected memory allocations
+- anv: disable protected content around surface state copies
+- anv: disable generated draws in protected command buffers
+- anv: update protection fault property
+- anv: add missing data flush out of L3 for transform feedback writes
+- anv: mark descriptors & pipeline dirty after blorp compute
+- isl: set NullPageCoherencyEnable for depth/stencil sparse surfaces
+
+Lucas Stach (2):
+
+- etnaviv: fix depth writes without testing
+- etnaviv: rs: take src dimensions into account when increasing height alignment
+
+Mike Blumenkrantz (12):
+
+- zink: only check that CUBE_COMPATIBLE for images doesn't subtract flags
+- zink: don't use set_foreach_remove with dmabuf_exports
+- zink: make descriptor pool creation more robust
+- zink: fix shaderdb pipeline compile
+- zink: don't clobber indirect array reads with missing components
+- zink: fix add_derefs case for compact arrays
+- llvmpipe: fix DRAW_USE_LLVM=0
+- glsl: handle xfb resources for spirv before running varying opts
+- mesa: clamp binary pointer in ShaderBinary if length==0
+- glsl: set PSIZ bit in outputs_written when injecting a 1.0 psiz write
+- nir/lower_clamp_color_outputs: fix use with lowered io
+- nir/texcoord_replace: fix scalarized io handling
+
+Nikita Popov (1):
+
+- Pass no-verify-fixpoint option to instcombine in LLVM 18
+
+Patrick Lerda (1):
+
+- r300: fix constants_remap_table memory leak related to the dummy shader path
+
+Paul Gofman (3):
+
+- glsl: allow out arrays in #110 with allow_glsl_120_subset_in_110
+- driconf: add a workaround for Joe Danger 2
+- driconf: add a workaround for Joe Danger
+
+Paulo Zanoni (2):
+
+- anv/xe: don't leak xe_syncs during trtt submission
+- anv, iris: add missing CS_STALL bit for GPGPU texture invalidation
+
+Samuel Pitoiset (3):
+
+- radv: fix conditional rendering with mesh+task and multiview (again)
+- radv: enable radv_zero_vram for Red Dead Redemption 2
+- radv: make sure the heap budget is less than or equal to the heap size
+
+Tapani Pälli (1):
+
+- anv: disable fcv optimization on >= gfx125
+
+Yonggang Luo (1):
+
+- util: Fixes futex_wait on win32
+
+Zack Rusin (1):
+
+- svga: Fix instanced draw detection
+
+Zan Dobersek (1):
+
+- tu: fix memory leaks in tu_shader

docs/relnotes/24.1.1.rst

@@ -0,0 +1,187 @@
+Mesa 24.1.1 Release Notes / 2024-06-05
+======================================
+
+Mesa 24.1.1 is a bug fix release which fixes bugs found since the 24.1.0 release.
+
+Mesa 24.1.1 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 24.1.1 implements the Vulkan 1.3 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    0038826c6f7e88d90b4ce6f719192fa58ca7dedf4edcaa1174cf7bd920ef89ea  mesa-24.1.1.tar.xz
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- [anv] failures when upgrading vulkancts 1.3.6 -> 1.3.7 on intel mesa ci
+- RustiCL: deadlock when calling clGetProfilingInfo() on callbacks
+- zink: nir validation failures in Sparse code
+- nir: nir_opt_varyings uses more stack than musl libc has
+- dEQP-VK.pipeline.pipeline_library.shader_module_identifier.pipeline_from_id.graphics regression
+
+
+Changes
+-------
+
+Amit Pundir (1):
+
+- android: Fix zink build failure
+
+Dave Airlie (1):
+
+- Revert "zink: use a slab allocator for zink_kopper_present_info"
+
+David Heidelberg (1):
+
+- ci/nouveau: move disabled jobs back from include into main gitlab-ci.yml
+
+David Rosca (1):
+
+- frontends/va: Fix leak when destroying VAEncCodedBufferType
+
+Eric Engestrom (8):
+
+- docs: add sha256sum for 24.1.0
+- .pick_status.json: Mark 410ca6a3e99c5c1c9c91f0f79bf43a35103cbd98 as denominated
+- freedreno/a6xx: fix kernel -> compute handling
+- panfrost: mark tests as fixed
+- panfrost/ci: add missing genxml trigger path
+- .pick_status.json: Update to f32a258503b40e8e19a1498998b0d4f8b8abb488
+- .pick_status.json: Update to 0311ac50adb6016efcb455ea52b11f422d6b797e
+- .pick_status.json: Update to 6889a0a5dd970bbfcd407085c8f12356a9dfe334
+
+Eric R. Smith (4):
+
+- get_color_read_type: make sure format/type combo is legal for gles
+- glsl: test both inputs when sorting varyings for xfb
+- panfrost: fix some omissions in valhall flow control
+- panfrost: change default rounding mode for samplers
+
+Faith Ekstrand (2):
+
+- nir: Handle cmat types in lower_variable_initializers
+- spirv: Handle constant cooperative matrices in OpCompositeExtract
+
+Friedrich Vock (2):
+
+- radv: Use max_se instead of num_se where appropriate
+- radeonsi: Use max_se instead of num_se where appropriate
+
+Iago Toral Quiroga (4):
+
+- broadcom/compiler: make add_node return the node index
+- broadcom/compiler: don't assign payload registers to spilling setup temps
+- broadcom/compiler: apply payload conflict to spill setup before RA
+- v3dv: fix incorrect index buffer size
+
+Ian Romanick (1):
+
+- nir/search: Fix is_16_bits for vectors
+
+Iván Briano (1):
+
+- anv: check cmd_buffer is on a transfer queue more properly
+
+Jose Maria Casanova Crespo (8):
+
+- v3d: fix CLE MMU errors avoiding using last bytes of CL BOs.
+- v3dv: fix CLE MMU errors avoiding using last bytes of CL BOs.
+- v3d: Increase alignment to 16k on CL BO on RPi5
+- v3dv: Increase alignment to 16k on CL BO on RPi5
+- v3dv: V3D_CL_MAX_INSTR_SIZE bytes in last CL instruction not needed
+- v3dv: Emit stencil draw clear if needed for GFXH-1461
+- v3dv: really fix CLE MMU errors on 7.1HW Rpi5
+- v3d: really fix CLE MMU errors on 7.1HW Rpi5
+
+Juan A. Suarez Romero (1):
+
+- ci: define SNMP base interface on runner
+
+Karol Herbst (7):
+
+- nouveau: import nvif/ioctl.h file from libdrm_nouveau
+- gallium/vl: stub vl_video_buffer_create_as_resource
+- gallium/vl: remove stubs which are defined in mesa_util
+- meson: centralize galliumvl_stub handling
+- rusticl: link against libgalliumvl_stub
+- rusticl/event: fix deadlock when calling clGetEventProfilingInfo inside callbacks
+- iris: fix PIPE_RESOURCE_PARAM_STRIDE for buffers
+
+Kevin Chuang (1):
+
+- anv: Properly fetch partial results in vkGetQueryPoolResults
+
+Konstantin Seurer (1):
+
+- llvmpipe: Use a second LLVMContext for compiling sample functions
+
+Lionel Landwerlin (8):
+
+- .pick_status.json: Update to ce43d7eb7f97bdde61b184a99940c4b03c2f0929
+- anv: fix shader identifier handling
+- intel/brw: ensure find_live_channel don't access arch register without sync
+- anv: fix utrace compute walker timestamp captures
+- anv: fix timestamp copies from secondary buffers
+- intel: fix HW generated local-id with indirect compute walker
+- brw: use a single virtual opcode to read ARF registers
+- anv: fix Gfx9 fast clears on srgb formats
+
+Mike Blumenkrantz (1):
+
+- zink: add atomic image ops to the ms deleting pass
+
+Natanael Copa (1):
+
+- nir/opt_varyings: reduce stack usage
+
+Renato Pereyra (1):
+
+- anv: Attempt to compile all pipelines even after errors
+
+Rhys Perry (1):
+
+- radv: malloc graphics pipeline stages
+
+Samuel Pitoiset (3):
+
+- radv: fix setting a custom pitch for CB on GFX10_3+
+- radv: fix flushing DB meta cache on GFX11.5
+- radv: fix VRS subpass attachments with mipmaps
+
+Tapani Pälli (1):
+
+- anv/android: enable emulated astc for applications
+
+Timur Kristóf (1):
+
+- radv: Fix TCS -> TES I/O linking typo of VARYING_SLOT vs. BIT.
+
+Valentine Burley (1):
+
+- wsi: Guard DRM-dependent function implementations with HAVE_LIBDRM
+
+Yusuf Khan (1):
+
+- zink/query: begin time elapsed queries even if we arent in a rp
+
+bbhtt (1):
+
+- nvk: Clean up unused header from libdrm_nouveau

docs/relnotes/24.1.2.rst

@@ -0,0 +1,228 @@
+Mesa 24.1.2 Release Notes / 2024-06-19
+======================================
+
+Mesa 24.1.2 is a bug fix release which fixes bugs found since the 24.1.1 release.
+
+Mesa 24.1.2 implements the OpenGL 4.6 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 4.6. OpenGL
+4.6 is **only** available if requested at context creation.
+Compatibility contexts may report a lower version depending on each driver.
+
+Mesa 24.1.2 implements the Vulkan 1.3 API, but the version reported by
+the apiVersion property of the VkPhysicalDeviceProperties struct
+depends on the particular driver being used.
+
+SHA256 checksum
+---------------
+
+::
+
+    TBD.
+
+
+New features
+------------
+
+- None
+
+
+Bug fixes
+---------
+
+- free_zombie_shaders() leave context in a bad state (access violation occurs)
+- [NINE]Far Cry 1 trees flicker regression[bisected][traces]
+- Vulkan: Most sync2 implementations are missing new access flags
+- Incorrect buffer_list advance when writing disjoint image descriptors
+- ANV: Block shadows in Cyberpunk on Intel A770
+- ACO ERROR: Temporary never defined or are defined after use
+- VAAPI ffmpeg encoding breaks with mesa-24.1.0
+- [ANV] Graphics memory allocation in Total War: Warhammer 3
+- NVK: Vulkan apps simply terminated with segfault under wayland and Xwayland
+- NVK: VK_ERROR_OUT_OF_DEVICE_MEMORY on swapchain creation
+- freedreno + perfetto missing dependency on adreno_common.xml.h
+
+
+Changes
+-------
+
+Amol Surati (1):
+
+- nine: avoid using post-compacted indices with state expecting pre-compacted ones
+
+Boris Brezillon (2):
+
+- pan/bi: Fix dynamic indexing of push constants
+- panvk: Fix Cube/2DArray/3D img -> buf copies
+
+Caio Oliveira (1):
+
+- intel/brw: Fix typo in DPAS emission code
+
+Daniel Schürmann (1):
+
+- aco/assembler: fix MTBUF opcode encoding on GFX11
+
+Danylo Piliaiev (1):
+
+- freedreno: Make fd_pps_driver.h usable without including other FD sources
+
+Dave Airlie (4):
+
+- nvk: Only enable WSI modifiers if the extension is supported.
+- draw/texture: handle mip_offset[0] being != 0 for layered textures.
+- nouveau/nvc0: increase overallocation on shader bo to 2K
+- radv/video: fix layered decode h264/5 tests.
+
+David Heidelberg (1):
+
+- rusticl: add -cl-std only when it's not defined
+
+David Rosca (2):
+
+- radeonsi: Fix si_compute_clear_render_target with 422 subsampled formats
+- radv/video: Add missing VCN 3.0.2 to decoder init switch
+
+Eric Engestrom (15):
+
+- docs: add sha256sum for 24.1.1
+- .pick_status.json: Update to 50e5067be77bf8f34de6616e8edca2af2cf8d310
+- v3dv: add missing bounds check in VK_EXT_4444_formats
+- .pick_status.json: Update to cc82f7f8ace50f68b06c53ad347e36d411ae9dab
+- radv/ci: fix manual rules
+- .pick_status.json: Update to 41dd1c52b1d091b36f8931c4a57d3b6dc361bc84
+- v3d/drm-shim: emulate a rpi4 instead of a rpi3
+- .pick_status.json: Update to a80a1c983844bca646d5f07d65c695a84f964bfe
+- egl: fix teardown when using xcb
+- .pick_status.json: Mark f017beb29ce6e3469da33caff2c9a493799faca6 as denominated
+- .pick_status.json: Update to 7dcba7e873c6b753930e2fdc8c714bb4da1a22dd
+- glx: fix build -D glx-direct=false
+- .pick_status.json: Update to 10d21d410068f2ca32fe898f6b4b690993d90daa
+- .pick_status.json: Mark a9fff07c2e2b1e52b00b30dc16781209f7761c04 as denominated
+- .pick_status.json: Update to 887f0e0af664b11c081b4140931e7213240c7b41
+
+Erik Faye-Lund (3):
+
+- mesa/main: remove stale prototype
+- mesa/main: do not allow RGBA_INTEGER et al in gles3
+- panvk: move macro-definition to header
+
+Faith Ekstrand (5):
+
+- nak: Only convert the written portion of the buffer in NirInstrPrinter
+- nak: BMov is always variable-latency
+- nak: Only copy-prop neg into iadd2/3 if no carry is written
+- nak/legalize: Fold immediate sources before instructions
+- nouveau: Fix a race in nouveau_ws_bo_destroy()
+
+Friedrich Vock (2):
+
+- radv/rt: Fix memory leak when compiling libraries
+- aco/spill: Don't spill phis with all-undef operands
+
+Georg Lehmann (1):
+
+- radeonsi: set COMPUTE_STATIC_THREAD_MGMT_SE2-3 correctly on gfx10-11
+
+Iago Toral Quiroga (1):
+
+- broadcom/compiler: initialize payload_conflict for all initial nodes
+
+Iván Briano (1):
+
+- vulkan/runtime: pColorAttachmentInputIndices is allowed to be NULL
+
+Job Noorman (14):
+
+- ir3: fix crash in try_evict_regs with src reg
+- ir3: fix handling of early clobbers in calc_min_limit_pressure
+- ir3: set offset on splits created while spilling
+- ir3: correctly set wrmask for reload.macro
+- ir3: don't remove intervals for non-killed tex prefetch sources
+- ir3: don't remove collects early while spilling
+- ir3: expose instruction indexing helper for merge sets
+- ir3: make indexing instructions optional in ir3_merge_regs
+- ir3: index instructions before fixing up merge sets after spilling
+- ir3: move liveness recalculation inside ir3_ra_shared
+- ir3: restore interval_offset after liveness recalculation in shared RA
+- ir3: add ir3_cursor/ir3_builder helpers
+- ir3: refactor ir3_spill.c to use the ir3_cursor/ir3_builder API
+- ir3: only add live-in phis for top-level intervals while spilling
+
+Karol Herbst (2):
+
+- rusticl/spirv: do not pass a NULL pointer to slice::from_raw_parts
+- rusticl/memory: copies might overlap for host ptrs
+
+Konstantin Seurer (2):
+
+- ac/llvm: Fix DENORM_FLUSH_TO_ZERO with exact instructions
+- ac/llvm: Enable helper invocations for vote_all/any
+
+Lionel Landwerlin (4):
+
+- anv: fix pipeline flag fields
+- anv: limit aux invalidations to primary command buffers
+- anv: ensure completion of surface state copies before secondaries
+- intel/fs: fix lower_simd_width for MOV_INDIRECT
+
+Lucas Fryzek (1):
+
+- llvmpipe: query winsys support for dmabuf mapping
+
+Marek Olšák (1):
+
+- Revert "radeonsi: fix initialization of occlusion query buffers for disabled RBs"
+
+Mary Guillemard (2):
+
+- panvk: Add missing null check in DestroyCommandPool
+- panvk: Check for maxBufferSize in panvk_CreateBuffer
+
+Mike Blumenkrantz (2):
+
+- lavapipe: fix mesh+task binding with shader objects
+- mesa/st: fix zombie shader handling for non-current programs
+
+Patrick Lerda (1):
+
+- radeonsi: fix assert triggered on gfx6 after the tessellation update
+
+Qiang Yu (2):
+
+- glsl: respect GL_EXT_shader_image_load_formatted when image is embedded in a struct
+- radeonsi: add missing nir_intrinsic_bindless_image_descriptor_amd
+
+Rhys Perry (4):
+
+- aco: don't combine vgpr into writelane src0
+- aco/gfx6: set glc for buffer_store_byte/short
+- aco: remove some missing label resets
+- aco: insert s_nop before discard early exit sendmsg(dealloc_vgpr)
+
+Samuel Pitoiset (4):
+
+- radv: fix creating unlinked shaders with ESO when nextStage is 0
+- radv: don't assume that TC_ACTION_ENA invalidates L1 cache on gfx9
+- radv: fix incorrect buffer_list advance for multi-planar descriptors
+- radv: always save/restore all shader objects for internal operations
+
+Sviatoslav Peleshko (3):
+
+- anv,driconf: Add fake non device local memory WA for Total War: Warhammer 3
+- intel/brw: Actually retype integer sources of sampler message payload
+- intel/elk: Actually retype integer sources of sampler message payload
+
+Timur Kristóf (1):
+
+- ac/nir/tess: Fix per-patch output LDS mapping.
+
+Valentine Burley (2):
+
+- tu: Handle the new sync2 flags
+- tu: Remove declaration of unused update_stencil_mask function
+
+Zan Dobersek (1):
+
+- tu: fix ZPASS_DONE interference between occlusion queries and autotuner

docs/relnotes/new_features.txt

@@ -1,12 +0,0 @@
-VK_EXT_map_memory_placed on RADV, ANV and NVK
-VK_KHR_shader_subgroup_rotate on RADV and ANV
-VK_KHR_load_store_op_none on RADV, ANV, NVK and Turnip
-VK_KHR_line_rasterization on RADV, ANV, NVK and Turnip
-VK_KHR_index_type_uint8 on RADV, ANV, NVK and Turnip
-VK_KHR_shader_expect_assume on all Vulkan drivers
-VK_KHR_shader_maximal_reconvergence on RADV
-VK_KHR_shader_quad_control on RADV
-OpenGL 4.6 on Asahi
-OpenGL ES 3.2 on Asahi
-Mali G610 and G310 on Panfrost
-Mali T600 on Panfrost

docs/rusticl.rst

@@ -1,6 +1,8 @@
 Rusticl
 =======
 
+Rusticl is an OpenCL implementation on top of Gallium drivers.
+
 Enabling
 --------
 

docs/vulkan/graphics-state.rst

@@ -30,12 +30,12 @@ the render pass and dynamic rendering.  For drivers which use
 structure will be populated as if for dynamic rendering, regardless of
 which path is used.  Drivers which use their own render pass structure
 should parse the render pass, if available, and pass a
-:c:struct:`vk_render_pass_state` to the `driver_rp` argument of
+:c:struct:`vk_render_pass_state` to the ``driver_rp`` argument of
 :c:func:`vk_graphics_pipeline_state_fill()` with the relevant information
 from the specified subpass.  If a render pass is available,
 :c:struct:`vk_render_pass_state` will be populated with the
 the information from the :c:struct:`driver_rp`.  If dynamic
-rendering is used or the driver provides a `NULL`
+rendering is used or the driver provides a ``NULL``
 :c:struct:`driver_rp`, the :c:struct:`vk_render_pass_state`
 structure will be populated for dynamic rendering, including color, depth,
 and stencil attachment formats.

include/GL/internal/dri_interface.h

@@ -915,7 +915,7 @@ struct __DRIframebufferRec {
  * extension.  Version 1 is required by the X server, and version 3 is used.
  */
 #define __DRI_SWRAST "DRI_SWRast"
-#define __DRI_SWRAST_VERSION 5
+#define __DRI_SWRAST_VERSION 6
 
 struct __DRIswrastExtensionRec {
     __DRIextension base;
@@ -967,6 +967,18 @@ struct __DRIswrastExtensionRec {
    */
    int (*queryBufferAge)(__DRIdrawable *drawable);
 
+   /**
+    * createNewScreen() with the driver extensions passed in and implicit load flag.
+    *
+    * \since version 6
+    */
+   __DRIscreen *(*createNewScreen3)(int screen,
+                                    const __DRIextension **loader_extensions,
+                                    const __DRIextension **driver_extensions,
+                                    const __DRIconfig ***driver_configs,
+                                    bool implicit,
+                                    void *loaderPrivate);
+
 };
 
 /** Common DRI function definitions, shared among DRI2 and Image extensions
@@ -978,6 +990,13 @@ typedef __DRIscreen *
                              const __DRIextension **driver_extensions,
                              const __DRIconfig ***driver_configs,
                              void *loaderPrivate);
+typedef __DRIscreen *
+(*__DRIcreateNewScreen3Func)(int screen, int fd,
+                             const __DRIextension **extensions,
+                             const __DRIextension **driver_extensions,
+                             const __DRIconfig ***driver_configs,
+                             bool implicit,
+                             void *loaderPrivate);
 
 typedef __DRIdrawable *
 (*__DRIcreateNewDrawableFunc)(__DRIscreen *screen,
@@ -1113,7 +1132,7 @@ struct __DRIdri2LoaderExtensionRec {
  * constructors for DRI2.  The X server uses up to version 4.
  */
 #define __DRI_DRI2 "DRI_DRI2"
-#define __DRI_DRI2_VERSION 4
+#define __DRI_DRI2_VERSION 5
 
 #define __DRI_API_OPENGL	0	/**< OpenGL compatibility profile */
 #define __DRI_API_GLES		1	/**< OpenGL ES 1.x */
@@ -1232,6 +1251,13 @@ struct __DRIdri2ExtensionRec {
     * \since version 4
     */
    __DRIcreateNewScreen2Func            createNewScreen2;
+
+   /**
+    * createNewScreen with the driver's extension list passed in and implicit load flag.
+    *
+    * \since version 5
+    */
+   __DRIcreateNewScreen3Func            createNewScreen3;
 };
 
 
@@ -2045,7 +2071,7 @@ struct __DRIimageLoaderExtensionRec {
  */
 
 #define __DRI_IMAGE_DRIVER           "DRI_IMAGE_DRIVER"
-#define __DRI_IMAGE_DRIVER_VERSION   1
+#define __DRI_IMAGE_DRIVER_VERSION   2
 
 struct __DRIimageDriverExtensionRec {
    __DRIextension               base;
@@ -2055,6 +2081,7 @@ struct __DRIimageDriverExtensionRec {
    __DRIcreateNewDrawableFunc           createNewDrawable;
    __DRIcreateContextAttribsFunc        createContextAttribs;
    __DRIgetAPIMaskFunc                  getAPIMask;
+   __DRIcreateNewScreen3Func            createNewScreen3;
 };
 
 /**

include/GL/internal/mesa_interface.h

@@ -33,7 +33,7 @@
 typedef struct __DRImesaCoreExtensionRec __DRImesaCoreExtension;
 
 #define __DRI_MESA "DRI_Mesa"
-#define __DRI_MESA_VERSION 1
+#define __DRI_MESA_VERSION 2
 
 struct dri_screen;
 
@@ -60,9 +60,12 @@ struct __DRImesaCoreExtensionRec {
    __DRIcreateContextAttribsFunc createContext;
 
    /* driver function for finishing initialization inside createNewScreen(). */
-   const __DRIconfig **(*initScreen)(struct dri_screen *screen);
+   const __DRIconfig **(*initScreen)(struct dri_screen *screen, bool implicit);
 
    int (*queryCompatibleRenderOnlyDeviceFd)(int kms_only_fd);
+
+   /* version 2 */
+   __DRIcreateNewScreen3Func createNewScreen3;
 };
 
 #endif /* MESA_INTERFACE_H */

include/drm-uapi/nouveau_drm.h

@@ -68,6 +68,13 @@ extern "C" {
  */
 #define NOUVEAU_GETPARAM_VRAM_USED 19
 
+/*
+ * NOUVEAU_GETPARAM_HAS_VMA_TILEMODE
+ *
+ * Query whether tile mode and PTE kind are accepted with VM allocs or not.
+ */
+#define NOUVEAU_GETPARAM_HAS_VMA_TILEMODE 20
+
 struct drm_nouveau_getparam {
 	__u64 param;
 	__u64 value;