.editorconfig

@@ -31,7 +31,7 @@ indent_size = 3
 [*.patch]
 trim_trailing_whitespace = false
 
-[{meson.build,meson_options.txt}]
+[{meson.build,meson.options}]
 indent_style = space
 indent_size = 2
 

.gitlab-ci.yml

@@ -256,6 +256,9 @@ include:
     # Build everything after someone bypassed the CI
     - if: *is-direct-push
       when: on_success
+    # Build everything when pushing to staging branches
+    - if: *is-staging-push
+      when: on_success
     # Build everything in scheduled pipelines
     - if: *is-scheduled-pipeline
       when: on_success

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

@@ -23,7 +23,7 @@ set +x
 
 # Pass through relevant env vars from the gitlab job to the baremetal init script
 echo "Variables passed through:"
-"$CI_COMMON"/generate-env.sh | tee $rootfs_dst/set-job-env-vars.sh
+"$CI_COMMON"/export-gitlab-job-env-for-dut.sh | tee $rootfs_dst/set-job-env-vars.sh
 
 set -x
 

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

@@ -72,6 +72,8 @@
     optional: true
   - job: debian-testing-asan
     optional: true
+  - job: debian-testing-ubsan
+    optional: true
   - job: debian-build-testing
     optional: true
   - job: debian-arm32
@@ -177,6 +179,7 @@ debian-testing-msan:
       -D b_sanitize=memory
       -D b_lundef=false
       -D mesa-clc=system
+      -D precomp-compiler=system
     S3_ARTIFACT_NAME: ""
     ARTIFACTS_DEBUG_SYMBOLS: 1
     # Don't run all the tests yet:
@@ -186,19 +189,21 @@ debian-testing-msan:
     GALLIUM_DRIVERS: "freedreno,iris,nouveau,r300,r600,llvmpipe,softpipe,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus"
     VULKAN_DRIVERS: intel,amd,broadcom,virtio
     RUN_MESON_TESTS: "false" # just too slow
-    # Do a host build for mesa-clc (msan complains about uninitialized
+    # Do a host build for mesa-clc and precomp-compiler (msan complains about uninitialized
     # values in the LLVM libs)
     HOST_BUILD_OPTIONS: >
       -D build-tests=false
       -D enable-glcpp-tests=false
       -D gallium-opencl=disabled
-      -D gallium-drivers=
+      -D gallium-drivers=panfrost
       -D vulkan-drivers=
       -D video-codecs=
       -D glx=disabled
       -D platforms=
       -D mesa-clc=enabled
       -D install-mesa-clc=true
+      -D precomp-compiler=enabled
+      -D install-precomp-compiler=true
 
 debian-testing-ubsan:
   extends:
@@ -330,6 +335,7 @@ debian-release:
       -D osmesa=true
       -D tools=all
       -D mesa-clc=enabled
+      -D precomp-compiler=enabled
       -D intel-rt=enabled
       -D imagination-srv=true
     BUILDTYPE: "release"
@@ -462,6 +468,7 @@ debian-android:
       -D valgrind=disabled
       -D android-libbacktrace=disabled
       -D mesa-clc=system
+      -D precomp-compiler=system
     GALLIUM_ST: >
       -D gallium-vdpau=disabled
       -D gallium-va=disabled
@@ -473,13 +480,15 @@ debian-android:
       -D build-tests=false
       -D enable-glcpp-tests=false
       -D gallium-opencl=disabled
-      -D gallium-drivers=
+      -D gallium-drivers=panfrost
       -D vulkan-drivers=
       -D video-codecs=
       -D glx=disabled
       -D platforms=
       -D mesa-clc=enabled
       -D install-mesa-clc=true
+      -D precomp-compiler=enabled
+      -D install-precomp-compiler=true
     ARTIFACTS_DEBUG_SYMBOLS: 1
     S3_ARTIFACT_NAME: mesa-x86_64-android-${BUILDTYPE}
   script:
@@ -543,6 +552,21 @@ debian-arm32:
       -D llvm=disabled
       -D valgrind=disabled
       -D gallium-rusticl=false
+      -D mesa-clc=system
+      -D precomp-compiler=system
+    HOST_BUILD_OPTIONS: >
+      -D build-tests=false
+      -D enable-glcpp-tests=false
+      -D gallium-opencl=disabled
+      -D gallium-drivers=panfrost
+      -D vulkan-drivers=
+      -D video-codecs=
+      -D glx=disabled
+      -D platforms=
+      -D mesa-clc=enabled
+      -D install-mesa-clc=true
+      -D precomp-compiler=enabled
+      -D install-precomp-compiler=true
     S3_ARTIFACT_NAME: mesa-arm32-default-${BUILDTYPE}
     # The strip command segfaults, failing to strip the binary and leaving
     # tempfiles in our artifacts.
@@ -742,6 +766,7 @@ debian-clang:
       -D vulkan-layers=device-select,overlay
       -D build-aco-tests=true
       -D mesa-clc=enabled
+      -D precomp-compiler=enabled
       -D intel-rt=enabled
       -D imagination-srv=true
       -D teflon=true

.gitlab-ci/common/generate-env.sh → .gitlab-ci/common/export-gitlab-job-env-for-dut.sh

@@ -10,9 +10,8 @@ VARS=(
     CI_COMMIT_REF_NAME
     CI_COMMIT_TITLE
     CI_JOB_ID
-    S3_JWT_FILE
-    CI_JOB_STARTED_AT
     CI_JOB_NAME
+    CI_JOB_STARTED_AT
     CI_JOB_URL
     CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
     CI_MERGE_REQUEST_TITLE
@@ -74,6 +73,7 @@ VARS=(
     LD_LIBRARY_PATH
     LIBGL_ALWAYS_SOFTWARE
     LP_NUM_THREADS
+    LVP_POISON_MEMORY
     MESA_BASE_TAG
     MESA_BUILD_PATH
     MESA_DEBUG
@@ -88,12 +88,10 @@ VARS=(
     MESA_TEMPLATES_COMMIT
     MESA_VK_ABORT_ON_DEVICE_LOSS
     MESA_VK_IGNORE_CONFORMANCE_WARNING
-    S3_HOST
-    S3_RESULTS_UPLOAD
     NIR_DEBUG
+    PANVK_DEBUG
     PAN_I_WANT_A_BROKEN_VULKAN_DRIVER
     PAN_MESA_DEBUG
-    PANVK_DEBUG
     PIGLIT_FRACTION
     PIGLIT_NO_WINDOW
     PIGLIT_OPTIONS
@@ -114,6 +112,9 @@ VARS=(
     RADEON_DEBUG
     RADV_DEBUG
     RADV_PERFTEST
+    S3_HOST
+    S3_JWT_FILE
+    S3_RESULTS_UPLOAD
     SKQP_ASSETS_DIR
     SKQP_BACKENDS
     STORAGE_FORK_HOST_PATH
@@ -122,11 +123,10 @@ VARS=(
     USE_ANGLE
     VIRGL_HOST_API
     VIRGL_RENDER_SERVER
-    WAFFLE_PLATFORM
     VK_DRIVER
-    ZINK_DESCRIPTORS
+    WAFFLE_PLATFORM
     ZINK_DEBUG
-    LVP_POISON_MEMORY
+    ZINK_DESCRIPTORS
 
     # Dead code within Mesa CI, but required by virglrender CI
     # (because they include our files in their CI)

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

@@ -7,11 +7,17 @@
 
 set -uex
 
-uncollapsed_section_start angle "Building angle"
+uncollapsed_section_start angle "Building ANGLE"
 
 ANGLE_REV="76025caa1a059f464a2b0e8f879dbd4746f092b9"
-SCRIPTS_DIR="$(pwd)/.gitlab-ci"
-ANGLE_PATCH_DIR="${SCRIPTS_DIR}/container/patches"
+
+# Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined
+if [[ -z "${ANGLE_ARCH:-}" ]]; then
+  case "$DEBIAN_ARCH" in
+    amd64) ANGLE_ARCH=x64;;
+    arm64) ANGLE_ARCH=arm64;;
+  esac
+fi
 
 # DEPOT tools
 git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git /depot-tools
@@ -26,33 +32,15 @@ git remote add origin https://chromium.googlesource.com/angle/angle.git
 git fetch --depth 1 origin "$ANGLE_REV"
 git checkout FETCH_HEAD
 
-angle_patch_files=(
-  build-angle_deps_Make-more-sources-conditional.patch
-)
-for patch in "${angle_patch_files[@]}"; do
-  echo "Apply patch to ANGLE from ${patch}"
-  GIT_COMMITTER_DATE="$(LC_TIME=C date -d@0)" git am < "${ANGLE_PATCH_DIR}/${patch}"
-done
-
-{
-  echo "ANGLE base version $ANGLE_REV"
-  echo "The following local patches are applied on top:"
-  git log --reverse --oneline $ANGLE_REV.. --format='- %s'
-} > /angle/version
-
-# Save the current git hash to /angle/hash after applying local patches
-git rev-parse HEAD > /angle/hash
+echo "$ANGLE_REV" > /angle/version
 
 GCLIENT_CUSTOM_VARS=()
 GCLIENT_CUSTOM_VARS+=('--custom-var=angle_enable_cl=False')
 GCLIENT_CUSTOM_VARS+=('--custom-var=angle_enable_cl_testing=False')
 GCLIENT_CUSTOM_VARS+=('--custom-var=angle_enable_vulkan_validation_layers=False')
 GCLIENT_CUSTOM_VARS+=('--custom-var=angle_enable_wgpu=False')
-GCLIENT_CUSTOM_VARS+=('--custom-var=build_allow_regenerate=False')
 GCLIENT_CUSTOM_VARS+=('--custom-var=build_angle_deqp_tests=False')
 GCLIENT_CUSTOM_VARS+=('--custom-var=build_angle_perftests=False')
-GCLIENT_CUSTOM_VARS+=('--custom-var=build_with_catapult=False')
-GCLIENT_CUSTOM_VARS+=('--custom-var=build_with_swiftshader=False')
 if [[ "$ANGLE_TARGET" == "android" ]]; then
   GCLIENT_CUSTOM_VARS+=('--custom-var=checkout_android=True')
 fi
@@ -62,20 +50,17 @@ gclient config --name REPLACE-WITH-A-DOT --unmanaged \
   "${GCLIENT_CUSTOM_VARS[@]}" \
   https://chromium.googlesource.com/angle/angle.git
 sed -e 's/REPLACE-WITH-A-DOT/./;' -i .gclient
-gclient sync -j"${FDO_CI_CONCURRENT:-4}"
-
-# TODO: The following patch seems necessary to avoid some errors when running
-# `gn gen out/Release` for Android, investigate and see if there is a better
-# way to handle this.
-angle_build_patch_files=(
-  build-angle-build_deps_fix-build-error.patch
-)
-pushd build/
-for patch in "${angle_build_patch_files[@]}"; do
-  echo "Apply patch to ANGLE build from ${patch}"
-  GIT_COMMITTER_DATE="$(LC_TIME=C date -d@0)" git am < "${ANGLE_PATCH_DIR}/${patch}"
-done
-popd
+sed -e 's|"custom_deps" : {|"custom_deps" : {\
+      "third_party/clspv/src": None,\
+      "third_party/dawn": None,\
+      "third_party/glmark2/src": None,\
+      "third_party/libjpeg_turbo": None,\
+      "third_party/llvm/src": None,\
+      "third_party/OpenCL-CTS/src": None,\
+      "third_party/SwiftShader": None,\
+      "third_party/VK-GL-CTS/src": None,\
+      "third_party/vulkan-validation-layers/src": None,|' -i .gclient
+gclient sync --no-history -j"${FDO_CI_CONCURRENT:-4}"
 
 mkdir -p out/Release
 cat > out/Release/args.gn <<EOF
@@ -103,32 +88,59 @@ enable_expensive_dchecks=false
 is_component_build=false
 is_debug=false
 target_cpu="${ANGLE_ARCH}"
+target_os="${ANGLE_TARGET}"
 EOF
 
 case "$ANGLE_TARGET" in
   linux) cat >> out/Release/args.gn <<EOF
 angle_egl_extension="so.1"
 angle_glesv2_extension="so.2"
+use_custom_libcxx=false
+custom_toolchain="//build/toolchain/linux/unbundle:default"
+host_toolchain="//build/toolchain/linux/unbundle:default"
 EOF
     ;;
   android) cat >> out/Release/args.gn <<EOF
-target_os="android"
 android_ndk_version="${ANDROID_NDK_VERSION}"
 android64_ndk_api_level=${ANDROID_SDK_VERSION}
 android32_ndk_api_level=${ANDROID_SDK_VERSION}
+use_custom_libcxx=true
 EOF
     ;;
     *) echo "Unexpected ANGLE_TARGET value: $ANGLE_TARGET"; exit 1;;
 esac
 
 if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
+  # We need to get an AArch64 sysroot - because ANGLE isn't great friends with
+  # system dependencies - but use the default system toolchain, because the
+  # 'arm64' toolchain you get from Google infrastructure is a cross-compiler
+  # from x86-64
   build/linux/sysroot_scripts/install-sysroot.py --arch=arm64
 fi
 
-gn gen out/Release
-# depot_tools overrides ninja with a version that doesn't work.  We want
-# ninja with FDO_CI_CONCURRENT anyway.
-/usr/local/bin/ninja -C out/Release/ libEGL libGLESv1_CM libGLESv2
+(
+  # The 'unbundled' toolchain configuration requires clang, and it also needs to
+  # be configured via environment variables.
+  export CC="clang-${LLVM_VERSION}"
+  export HOST_CC="$CC"
+  export CFLAGS="-Wno-unknown-warning-option"
+  export HOST_CFLAGS="$CFLAGS"
+  export CXX="clang++-${LLVM_VERSION}"
+  export HOST_CXX="$CXX"
+  export CXXFLAGS="-Wno-unknown-warning-option"
+  export HOST_CXXFLAGS="$CXXFLAGS"
+  export AR="ar"
+  export HOST_AR="$AR"
+  export NM="nm"
+  export HOST_NM="$NM"
+  export LDFLAGS="-lpthread -ldl"
+  export HOST_LDFLAGS="$LDFLAGS"
+
+  gn gen out/Release
+  # depot_tools overrides ninja with a version that doesn't work.  We want
+  # ninja with FDO_CI_CONCURRENT anyway.
+  /usr/local/bin/ninja -C out/Release/ libEGL libGLESv1_CM libGLESv2
+)
 
 rm -f out/Release/libvulkan.so* out/Release/*.so*.TOC
 cp out/Release/lib*.so* /angle/

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

@@ -38,6 +38,12 @@ sh .gitlab-ci/container/create-android-cross-file.sh /$ndk i686-linux-android x8
 sh .gitlab-ci/container/create-android-cross-file.sh /$ndk aarch64-linux-android aarch64 armv8 $ANDROID_SDK_VERSION
 sh .gitlab-ci/container/create-android-cross-file.sh /$ndk arm-linux-androideabi arm armv7hl $ANDROID_SDK_VERSION armv7a-linux-androideabi
 
+# Build libdrm for the host (Debian) environment, so it's available for
+# binaries we'll run as part of the build process
+. .gitlab-ci/container/build-libdrm.sh
+
+# Build libdrm for the NDK environment, so it's available when building for
+# the Android target
 for arch in \
         x86_64-linux-android \
         i686-linux-android \

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

@@ -49,7 +49,6 @@ rm "$ndk.zip"
 ############### Build ANGLE
 
 ANGLE_TARGET=android \
-ANGLE_ARCH=x64 \
 DEBIAN_ARCH=amd64 \
 . .gitlab-ci/container/build-angle.sh
 
@@ -84,6 +83,8 @@ rm -rf /VK-GL-CTS
 
 ############### Downloading Cuttlefish resources ...
 
+uncollapsed_section_start cuttlefish "Downloading, building and installing Cuttlefish"
+
 CUTTLEFISH_PROJECT_PATH=ao2/aosp-manifest
 CUTTLEFISH_BUILD_VERSION_TAGS=mesa-venus
 CUTTLEFISH_BUILD_NUMBER=20250115.001
@@ -129,6 +130,8 @@ git checkout FETCH_HEAD
 
 apt-get install -y --allow-downgrades ./cuttlefish-base_*.deb ./cuttlefish-user_*.deb
 
+section_end cuttlefish
+
 popd
 rm -rf android-cuttlefish
 

.gitlab-ci/container/lava_build.sh

@@ -161,6 +161,7 @@ CONTAINER_EPHEMERAL=(
     libxcb-dri2-0-dev
     libxkbcommon-dev
     libwayland-dev
+    lld
     ninja-build
     openssh-server
     patch
@@ -304,9 +305,8 @@ mv /apitrace/build $ROOTFS/apitrace
 rm -rf /apitrace
 
 ############### Build ANGLE
-if [[ "$DEBIAN_ARCH" = "amd64" ]]; then
+if [ "$DEBIAN_ARCH" != "armhf" ]; then
   ANGLE_TARGET=linux \
-  ANGLE_ARCH=x64 \
   . .gitlab-ci/container/build-angle.sh
   mv /angle $ROOTFS/.
   rm -rf /angle

.gitlab-ci/container/patches/build-angle-build_deps_fix-build-error.patch

-From 3b19c8cd2da7060574304c98d79f23be3158f297 Mon Sep 17 00:00:00 2001
-From: Antonio Ospite <antonio.ospite@collabora.com>
-Date: Mon, 20 Jan 2025 09:38:46 +0100
-Subject: [PATCH] Fix building on Android with minimal dependencies
-
-The fixes the following error:
-
-+ gn gen out/Android
-ERROR at //build/android/BUILD.gn:233:5: Unable to load "/angle-android-build/third_party/catapult/tracing/BUILD.gn".
-    "//third_party/catapult/tracing:convert_chart_json",
-    ^--------------------------------------------------
----
- android/BUILD.gn | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/android/BUILD.gn b/android/BUILD.gn
-index 3c6fc6ab5..db25974a6 100644
---- a/android/BUILD.gn
-+++ b/android/BUILD.gn
-@@ -230,7 +230,6 @@ python_library("resource_sizes_py") {
-   pydeps_file = "resource_sizes.pydeps"
-   data_deps = [
-     ":devil_chromium_py",
--    "//third_party/catapult/tracing:convert_chart_json",
-   ]
- 
-   data = [
--- 
-2.47.1
-

.gitlab-ci/container/patches/build-angle_deps_Make-more-sources-conditional.patch

-From 2f4a38ecfde470abcd5d3c0ae7337bf780343469 Mon Sep 17 00:00:00 2001
-From: Daniel Stone <daniels@collabora.com>
-Date: Tue, 15 Oct 2024 16:02:26 +0100
-Subject: [PATCH] deps: Make more sources conditional
-
-Fetching all the dependent sources - including at least one copy of LLVM
-- can take a surprising amount of time. Mesa needs to build ANGLE as
-part of CI, and the cost of downloading all the sources all of the time
-is not OK for the number of dependencies we don't need during the build.
----
- DEPS | 33 +++++++++++++++++++++++----------
- 1 file changed, 23 insertions(+), 10 deletions(-)
-
-Submitted upstream at:
-https://chromium-review.googlesource.com/c/angle/angle/+/5937820
-
-diff --git a/DEPS b/DEPS
-index 61263fb7af..0cff8c3126 100644
---- a/DEPS
-+++ b/DEPS
-@@ -17,6 +17,17 @@ gclient_gn_args = [
- ]
- 
- vars = {
-+  'angle_enable_cl': True,
-+  'angle_enable_cl_testing': False,
-+  'angle_enable_vulkan': True,
-+  'angle_enable_vulkan_validation_layers': True,
-+  'angle_enable_wgpu': True,
-+  'build_angle_deqp_tests': True,
-+  'build_angle_perftests': True,
-+  'build_with_swiftshader': True,
-+  'use_custom_libcxx': True,
-+  'export_libcxxapi_from_executables': True,
-+
-   'android_git': 'https://android.googlesource.com',
-   'chromium_git': 'https://chromium.googlesource.com',
-   'chrome_internal_git': 'https://chrome-internal.googlesource.com',
-@@ -673,7 +684,7 @@ deps = {
- 
-   'third_party/catapult': {
-     'url': Var('chromium_git') + '/catapult.git' + '@' + Var('catapult_revision'),
--    'condition': 'not build_with_chromium',
-+    'condition': 'build_with_catapult and not build_with_chromium',
-   },
- 
-   # Cherry is a dEQP/VK-GL-CTS management GUI written in Go. We use it for viewing test results.
-@@ -689,7 +700,7 @@ deps = {
- 
-   'third_party/clspv/src': {
-     'url': Var('chromium_git') + '/external/github.com/google/clspv@a173c052455434a422bcfe5c12ffe44d574fd6e1',
--    'condition': 'not build_with_chromium',
-+    'condition': 'angle_enable_cl and angle_enable_vulkan and not build_with_chromium',
-   },
- 
-   'third_party/cpu_features/src': {
-@@ -700,7 +711,7 @@ deps = {
- 
-   'third_party/dawn': {
-     'url': Var('dawn_git') + '/dawn.git' + '@' +  Var('dawn_revision'),
--    'condition': 'not build_with_chromium'
-+    'condition': 'angle_enable_wgpu and not build_with_chromium'
-   },
- 
-   'third_party/depot_tools': {
-@@ -745,6 +756,7 @@ deps = {
-   # glmark2 is a GPL3-licensed OpenGL ES 2.0 benchmark. We use it for testing.
-   'third_party/glmark2/src': {
-     'url': Var('chromium_git') + '/external/github.com/glmark2/glmark2@ca8de51fedb70bace5351c6b002eb952c747e889',
-+    'condition': 'build_angle_perftests',
-   },
- 
-   'third_party/googletest': {
-@@ -777,7 +789,7 @@ deps = {
-   # libjpeg_turbo is used by glmark2.
-   'third_party/libjpeg_turbo': {
-     'url': Var('chromium_git') + '/chromium/deps/libjpeg_turbo.git@927aabfcd26897abb9776ecf2a6c38ea5bb52ab6',
--    'condition': 'not build_with_chromium',
-+    'condition': 'build_angle_perftests and not build_with_chromium',
-   },
- 
-   'third_party/libpng/src': {
-@@ -787,7 +799,7 @@ deps = {
- 
-   'third_party/llvm/src': {
-     'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project@d222fa4521531cc4ac14b8e157d231c108c003be',
--    'condition': 'not build_with_chromium',
-+    'condition': '(build_with_swiftshader or (angle_enable_cl and angle_enable_vulkan)) and not build_with_chromium',
-   },
- 
-   'third_party/jdk': {
-@@ -824,12 +836,12 @@ deps = {
- 
-   'third_party/libc++/src': {
-     'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxx.git@6a68fd412b9aecd515a20a7cf84d11b598bfaf96',
--    'condition': 'not build_with_chromium',
-+    'condition': 'use_custom_libcxx and not build_with_chromium',
-   },
- 
-   'third_party/libc++abi/src': {
-     'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libcxxabi.git@9a1d90c3b412d5ebeb97a6e33d98e1d0dd923221',
--    'condition': 'not build_with_chromium',
-+    'condition': 'export_libcxxapi_from_executables and not build_with_chromium',
-   },
- 
-   'third_party/libunwind/src': {
-@@ -872,7 +884,7 @@ deps = {
- 
-   'third_party/OpenCL-CTS/src': {
-     'url': Var('chromium_git') + '/external/github.com/KhronosGroup/OpenCL-CTS@e0a31a03fc8f816d59fd8b3051ac6a61d3fa50c6',
--    'condition': 'not build_with_chromium',
-+    'condition': 'angle_enable_cl_testing and not build_with_chromium',
-   },
- 
-   'third_party/OpenCL-Docs/src': {
-@@ -968,7 +980,7 @@ deps = {
- 
-   'third_party/SwiftShader': {
-     'url': Var('swiftshader_git') + '/SwiftShader@7a9a492a38b7c701f7c96a15a76046aed8f8c0c3',
--    'condition': 'not build_with_chromium',
-+    'condition': 'build_with_swiftshader and not build_with_chromium',
-   },
- 
-   'third_party/turbine/cipd': {
-@@ -984,6 +996,7 @@ deps = {
- 
-   'third_party/VK-GL-CTS/src': {
-     'url': Var('chromium_git') + '/external/github.com/KhronosGroup/VK-GL-CTS' + '@' + Var('vk_gl_cts_revision'),
-+    'condition': 'build_angle_deqp_tests',
-   },
- 
-   'third_party/vulkan-deps': {
-@@ -1038,7 +1051,7 @@ deps = {
- 
-   'third_party/vulkan-validation-layers/src': {
-     'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@b63e9bd51fbd7bf8fea161a4f7c06994abc24b75',
--    'condition': 'not build_with_chromium',
-+    'condition': 'angle_enable_vulkan_validation_layers and not build_with_chromium',
-   },
- 
-   'third_party/vulkan_memory_allocator': {
--- 
-2.46.2
-

.gitlab-ci/crosvm-runner.sh

@@ -76,7 +76,7 @@ set_vsock_context || { echo "Could not generate crosvm vsock CID" >&2; exit 1; }
 # Securely pass the current variables to the crosvm environment
 echo "Variables passed through:"
 SCRIPTS_DIR=$(readlink -en "${0%/*}")
-${SCRIPTS_DIR}/common/generate-env.sh | tee ${VM_TEMP_DIR}/crosvm-env.sh
+${SCRIPTS_DIR}/common/export-gitlab-job-env-for-dut.sh | tee ${VM_TEMP_DIR}/crosvm-env.sh
 cp ${SCRIPTS_DIR}/setup-test-env.sh ${VM_TEMP_DIR}/setup-test-env.sh
 
 # Set the crosvm-script as the arguments of the current script

.gitlab-ci/cuttlefish-runner.sh

@@ -172,7 +172,7 @@ while [ "$($ADB shell dumpsys SurfaceFlinger | grep GLES:)" = "" ] ; do sleep 1;
 MESA_RUNTIME_VERSION="$($ADB shell dumpsys SurfaceFlinger | grep GLES:)"
 
 if [ "$USE_ANGLE" = 1 ]; then
-  ANGLE_HASH=$(head -c 12 /angle/hash)
+  ANGLE_HASH=$(head -c 12 /angle/version)
   if ! printf "%s" "$MESA_RUNTIME_VERSION" | grep --quiet "${ANGLE_HASH}"; then
     echo "Fatal: Android is loading a wrong version of the ANGLE libs: ${ANGLE_HASH}" 1>&2
     exit 1

.gitlab-ci/image-tags.yml

@@ -16,7 +16,7 @@ variables:
    DEBIAN_BASE_TAG: "20250204-arm32"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "20250128-llvm19-up"
+   DEBIAN_BUILD_TAG: "20250210-android-drm"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
    DEBIAN_ARM32_TEST_BASE_IMAGE: "debian/arm32_test-base"
@@ -30,10 +30,10 @@ variables:
    DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk"
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
-   DEBIAN_TEST_ANDROID_TAG: "20250206-right-angle"
+   DEBIAN_TEST_ANDROID_TAG: "20250212-re-angle"
    DEBIAN_TEST_GL_TAG: "20250204-fix-deqp"
    DEBIAN_TEST_VK_TAG: "20250204-fix-deqp"
-   KERNEL_ROOTFS_TAG: "20250206-right-angle"
+   KERNEL_ROOTFS_TAG: "20250212-arm-angle"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20250129-lavacli"

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

@@ -47,7 +47,7 @@ ROOTFS_URL="$(get_path_to_artifact lava-rootfs.tar.zst)"
 rm -rf results
 mkdir -p results/job-rootfs-overlay/
 
-artifacts/ci-common/generate-env.sh > results/job-rootfs-overlay/set-job-env-vars.sh
+artifacts/ci-common/export-gitlab-job-env-for-dut.sh > results/job-rootfs-overlay/set-job-env-vars.sh
 cp artifacts/ci-common/init-*.sh results/job-rootfs-overlay/
 cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/
 

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

@@ -55,7 +55,7 @@
         - .gitlab-ci/**/*
         - include/**/*
         - meson.build
-        - meson_options.txt
+        - meson.options
         - build-support/**/*
         - subprojects/**/*
         - .gitattributes

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

@@ -64,7 +64,8 @@ yaml-toml-shell-py-test:
     - !reference [.disable-farm-mr-rules, rules]
     - !reference [.never-post-merge-rules, rules]
     - !reference [.no_scheduled_pipelines-rules, rules]
-    - if: $GITLAB_USER_LOGIN == "marge-bot"
+    # merge pipeline
+    - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
       changes: &lint_files
         - .gitlab-ci/test/gitlab-ci.yml
         - .gitlab-ci/**/*.sh
@@ -74,6 +75,14 @@ yaml-toml-shell-py-test:
         - .gitlab-ci/tests/**/*
         - bin/ci/**/*
       when: on_success
+    # direct pushes that bypassed the CI
+    - if: $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+      changes: *lint_files
+      when: on_success
+    # direct pushes from release manager
+    - if: $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME =~ /^staging\//
+      changes: *lint_files
+      when: on_success
     - changes: *lint_files
       when: manual
   tags:
@@ -158,7 +167,7 @@ yaml-toml-shell-py-test:
     HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
   script:
     - section_start variables "Variables passed through:"
-    - install/common/generate-env.sh
+    - install/common/export-gitlab-job-env-for-dut.sh
     - section_end variables
     - install/piglit/piglit-traces.sh
 
@@ -371,7 +380,7 @@ yaml-toml-shell-py-test:
       # Create a script to regenerate the CI environment when this job
       # begins running on the remote DUT.
       set +x
-      "$CI_COMMON_SCRIPTS"/generate-env.sh > ${JOB_FOLDER}/set-job-env-vars.sh
+      "$CI_COMMON_SCRIPTS"/export-gitlab-job-env-for-dut.sh > ${JOB_FOLDER}/set-job-env-vars.sh
       echo "export SCRIPTS_DIR=./install" >> ${JOB_FOLDER}/set-job-env-vars.sh
       echo "Variables passed through:"
       cat ${JOB_FOLDER}/set-job-env-vars.sh

.mr-label-maker.yml

@@ -140,7 +140,7 @@ merge_requests:
         '^include/drm-uapi/i915_drm.h': ['intel']
         '^include/drm-uapi/xe_drm.h': ['intel']
         '^include/vulkan/': ['vulkan']
-        '^meson_options.txt': ['meson']
+        '^meson.options': ['meson']
         '^README.rst': ['docs']
         '^src/amd/addrlib/': ['AMD common']
         '^src/amd/common/': ['AMD common']

CODEOWNERS

@@ -21,7 +21,7 @@
 
 # Build system - Meson
 meson.build @dbaker @eric
-/meson_options.txt @dbaker @eric
+/meson.options @dbaker @eric
 /docs/meson.rst @dbaker @eric
 
 # Build system - Android

docs/drivers/freedreno.rst

@@ -654,8 +654,8 @@ Additionally, not all ``TU_DEBUG`` options can be toggled at runtime, the follow
 are supported at the moment: ``nir``, ``nobin``, ``sysmem``, ``gmem``, ``forcebin``,
 ``layout``, ``nolrz``, ``nolrzfc``, ``perf``, ``flushall``, ``syncdraw``,
 ``rast_order``, ``unaligned_store``, ``log_skip_gmem_ops``, ``3d_load``, ``fdm``,
-``noconcurrentresolves``, ``noconcurrentunresolves``.
+``noconcurrentresolves``, ``noconcurrentunresolves``, ``nobinmerging``.
 
 Some of these options will behave differently when toggled at runtime, for example:
 ``nolrz`` will still result in LRZ allocation which would not happen if the option
-was set in the environment variable.
\ No newline at end of file
+was set in the environment variable.