fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-18 18:08:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Uprev ANGLE to 7772c5602d59140204494967ba8ebdf801180054
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
5e591d0365...7772c5602d

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40965>
This commit is contained in:
Collabora's Gfx CI Team 2026-04-15 00:09:20 +00:00 • committed by Sergi Blanch Torne
parent b24a4c3cd0
commit 054dd22eb6
4 changed files with 37 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci/conditional-build-image-tags.yml
View file

@ -1,6 +1,6 @@
variables:
CONDITIONAL_BUILD_ANDROID_CTS_TAG: 363c33efa7f381a9be0d4c6af2dfaa1d
CONDITIONAL_BUILD_ANGLE_TAG: e40de41a79653aa19fac70dc6289d8e9
CONDITIONAL_BUILD_ANGLE_TAG: 6ab21f6e04363ee652c71461e7fbe5f7
CONDITIONAL_BUILD_CROSVM_TAG: 7edabf28bbd50e00558e3b0bb2d94255
CONDITIONAL_BUILD_FLUSTER_TAG: e13f8521875ebd70e207ec0f6f3d3e5b
CONDITIONAL_BUILD_PIGLIT_TAG: 7c554632e450496da9382764f449abae

47
.gitlab-ci/container/build-angle.sh
View file

@ -13,7 +13,7 @@ section_start angle "Building ANGLE"
# setting up the environment variables locally
ci_tag_build_time_check "ANGLE_TAG"
ANGLE_REV="5e591d03650dd427001e355f4884b857cadab113"
ANGLE_REV="7772c5602d59140204494967ba8ebdf801180054"
DEPOT_REV="5982a1aeb33dc36382ed8c62eddf52a6135e7dd3"
# Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined
@ -143,28 +143,43 @@ fi
# The Chromium build system hardcodes these flags, and they're not compatible
# with our clang19 'unbundled' toolchain. See:
# https://chromium.googlesource.com/chromium/src/build/+/39d42026/config/compiler/BUILD.gn#619
# https://chromium.googlesource.com/chromium/src/build/+/71caaf82/config/compiler/BUILD.gn#604
# https://chromium.googlesource.com/chromium/src/build/+/71caaf82/config/compiler/BUILD.gn#643
# https://chromium.googlesource.com/chromium/src/build/+/42209031/config/sanitizers/sanitizers.gni#548
sed -i '/-fdiagnostics-show-inlining-chain/d' build/config/compiler/BUILD.gn
sed -i '/-fno-lifetime-dse/d' build/config/compiler/BUILD.gn
sed -i '/-fsanitize-ignore-for-ubsan-feature=/d' build/config/sanitizers/sanitizers.gni
(
# The 'unbundled' toolchain configuration requires clang, and it also needs to
# be configured via environment variables.
export CC="clang-${LLVM_VERSION}"
export HOST_CC="$CC"
export CFLAGS="-Wno-unknown-warning-option"
export HOST_CFLAGS="$CFLAGS"
export CXX="clang++-${LLVM_VERSION}"
export HOST_CXX="$CXX"
export CXXFLAGS="-Wno-unknown-warning-option"
export HOST_CXXFLAGS="$CXXFLAGS"
export AR="ar"
export HOST_AR="$AR"
export NM="nm"
export HOST_NM="$NM"
export LDFLAGS="-fuse-ld=lld-${LLVM_VERSION} -lpthread -ldl"
export HOST_LDFLAGS="$LDFLAGS"
if [[ "$ANGLE_TARGET" == "linux" ]]; then
CC="$(command -v "clang-${LLVM_VERSION}")"
export CC
export HOST_CC="$CC"
export BUILD_CC="$CC"
export CFLAGS="-Wno-unknown-warning-option"
export HOST_CFLAGS="$CFLAGS"
export BUILD_CFLAGS="$CFLAGS"
CXX="$(command -v "clang++-${LLVM_VERSION}")"
export CXX
export HOST_CXX="$CXX"
export BUILD_CXX="$CXX"
export CXXFLAGS="-Wno-unknown-warning-option"
export HOST_CXXFLAGS="$CXXFLAGS"
export BUILD_CXXFLAGS="$CXXFLAGS"
AR="$(command -v ar)"
export AR
export HOST_AR="$AR"
export BUILD_AR="$AR"
NM="$(command -v nm)"
export NM
export HOST_NM="$NM"
export BUILD_NM="$NM"
export LDFLAGS="-fuse-ld=lld-${LLVM_VERSION} -lpthread -ldl"
export HOST_LDFLAGS="$LDFLAGS"
export BUILD_LDFLAGS="$LDFLAGS"
fi
gn gen out/Release
# depot_tools overrides ninja with a version that doesn't work. We want

4
.gitlab-ci/image-tags.yml
View file

@ -23,8 +23,8 @@ variables:
DEBIAN_BUILD_TAG: "20260430-imgui.2"
DEBIAN_TEST_BASE_TAG: "20260502-virgl"
DEBIAN_TEST_ANDROID_TAG: "20260515-wsi-fix"
DEBIAN_TEST_GL_TAG: "20260515-vvl-d5"
DEBIAN_TEST_ANDROID_TAG: "20260515-angle-777"
DEBIAN_TEST_GL_TAG: "20260515-angle-777"
DEBIAN_TEST_VIDEO_TAG: "20260512-vkuprev"
DEBIAN_TEST_VK_TAG: "20260514-vkbackport"

3
src/freedreno/ci/freedreno-a618-flakes.txt
View file

@ -374,6 +374,9 @@ angle-dEQP-GLES31.functional.copy_image.non_compressed.viewclass_16_bits.rg8i_r1
angle-dEQP-GLES31.functional.copy_image.non_compressed.viewclass_16_bits.rg8ui_r16i.texture2d_to_cubemap
angle-dEQP-GLES31.functional.state_query.program.tesselation_shader_state_get_programiv
# Autotune regression
angle-dEQP-GLES3.functional.fbo.msaa.4_samples.rgb5_a1
# Android flakes
android-dEQP-VK.binding_model.shader_access.primary_cmd_buf.bind.with_template.sampler_mutable.no_access.single_descriptor.2d_array_base_mip
android-dEQP-VK.pipeline.fast_linked_library.stencil.nocolor.format.d24_unorm_s8_uint.states.fail_wrap.pass_decc.dfail_decc.comp_never.any