.gitlab-ci.yml

@@ -30,6 +30,10 @@ workflow:
     # do not duplicate pipelines on merge pipelines
     - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"
       when: never
+    # tag pipelines are disabled as it's too late to run all the tests by
+    # then, the release has been made based on the staging pipelines results
+    - if: $CI_COMMIT_TAG
+      when: never
     # merge pipeline
     - if: &is-merge-attempt $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"
       variables:
@@ -53,7 +57,11 @@ workflow:
         # Note: 0 = infinity = gitlab's job `timeout:` applies, which is 1h
         BUILD_JOB_TIMEOUT_OVERRIDE: 0
     # 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"
+    - if: &is-direct-push $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+      variables:
+        JOB_PRIORITY: 70
+    # pipeline for direct pushes from release maintainer
+    - if: &is-staging-push $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME =~ /^staging\//
       variables:
         JOB_PRIORITY: 70
 

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

@@ -82,6 +82,8 @@
     optional: true
   - job: debian-arm64-asan
     optional: true
+  - job: debian-android
+    optional: true
   # Windows runners don't have more than one build right now, so there is
   # no need to wait on the "first one" to be done.
   # - job: windows-msvc
@@ -429,9 +431,9 @@ debian-android:
     - .meson-cross
     - .use-debian/android_build
     - .ci-deqp-artifacts
+  stage: build-for-tests
   needs:
     - !reference [.use-debian/android_build, needs]
-    - !reference [.build-for-tests-jobs]
   variables:
     BUILDTYPE: debug
     UNWIND: "disabled"

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

@@ -2,6 +2,7 @@
 
 # When changing this file, you need to bump the following
 # .gitlab-ci/image-tags.yml tags:
+# DEBIAN_TEST_ANDROID_TAG
 # KERNEL_ROOTFS_TAG
 
 set -uex
@@ -39,23 +40,46 @@ done
   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
+
+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
+
 # source preparation
 gclient config --name REPLACE-WITH-A-DOT --unmanaged \
-  --custom-var='angle_enable_cl=False' \
-  --custom-var='angle_enable_cl_testing=False' \
-  --custom-var='angle_enable_vulkan_validation_layers=False' \
-  --custom-var='angle_enable_wgpu=False' \
-  --custom-var='build_allow_regenerate=False' \
-  --custom-var='build_angle_deqp_tests=False' \
-  --custom-var='build_angle_perftests=False' \
-  --custom-var='build_with_catapult=False' \
-  --custom-var='build_with_swiftshader=False' \
+  "${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
+
 mkdir -p out/Release
-echo '
+cat > out/Release/args.gn <<EOF
+angle_assert_always_on=false
 angle_build_all=false
 angle_build_tests=false
 angle_enable_cl=false
@@ -71,14 +95,31 @@ angle_enable_vulkan_api_dump_layer=false
 angle_enable_vulkan_validation_layers=false
 angle_has_frame_capture=false
 angle_has_histograms=false
+angle_has_rapidjson=false
 angle_use_custom_libvulkan=false
-angle_egl_extension="so.1"
-angle_glesv2_extension="so.2"
 build_angle_deqp_tests=false
 dcheck_always_on=true
 enable_expensive_dchecks=false
+is_component_build=false
 is_debug=false
-' > out/Release/args.gn
+target_cpu="${ANGLE_ARCH}"
+EOF
+
+case "$ANGLE_TARGET" in
+  linux) cat >> out/Release/args.gn <<EOF
+angle_egl_extension="so.1"
+angle_glesv2_extension="so.2"
+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}
+EOF
+    ;;
+    *) echo "Unexpected ANGLE_TARGET value: $ANGLE_TARGET"; exit 1;;
+esac
 
 if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
   build/linux/sysroot_scripts/install-sysroot.py --arch=arm64
@@ -87,12 +128,15 @@ 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 libGLESv2
+/usr/local/bin/ninja -C out/Release/ libEGL libGLESv1_CM libGLESv2
 
-rm -f out/Release/libvulkan.so* out/Release/*.so.TOC
+rm -f out/Release/libvulkan.so* out/Release/*.so*.TOC
 cp out/Release/lib*.so* /angle/
-ln -s libEGL.so.1 /angle/libEGL.so
-ln -s libGLESv2.so.2 /angle/libGLESv2.so
+
+if [[ "$ANGLE_TARGET" == "linux" ]]; then
+  ln -s libEGL.so.1 /angle/libEGL.so
+  ln -s libGLESv2.so.2 /angle/libGLESv2.so
+fi
 
 rm -rf out
 

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

@@ -67,13 +67,6 @@ gl_cts_patch_files=(
   build-deqp-gl_Build-Don-t-build-Vulkan-utilities-for-GL-builds.patch
 )
 
-if [ "${DEQP_TARGET}" = 'android' ]; then
-  gl_cts_patch_files+=(
-    build-deqp-gl_Allow-running-on-Android-from-the-command-line.patch
-    build-deqp-gl_Android-prints-to-stdout-instead-of-logcat.patch
-  )
-fi
-
 # shellcheck disable=SC2034
 # GLES builds also EGL
 gles_cts_commits_to_backport=(

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

@@ -46,6 +46,13 @@ curl -L --retry 4 -f --retry-all-errors --retry-delay 60 \
 unzip -d / "$ndk.zip"
 rm "$ndk.zip"
 
+############### Build ANGLE
+
+ANGLE_TARGET=android \
+ANGLE_ARCH=x64 \
+DEBIAN_ARCH=amd64 \
+. .gitlab-ci/container/build-angle.sh
+
 ############### Build dEQP runner
 
 export ANDROID_NDK_HOME=/$ndk
@@ -56,18 +63,13 @@ export RUST_TARGET=x86_64-linux-android
 rm -rf /root/.cargo
 rm -rf /root/.rustup
 
-############### Build dEQP GL
+############### Build dEQP
 
 DEQP_API=tools \
 DEQP_TARGET="android" \
 EXTRA_CMAKE_ARGS="-DDEQP_ANDROID_EXE=ON -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
 . .gitlab-ci/container/build-deqp.sh
 
-DEQP_API=GL \
-DEQP_TARGET="android" \
-EXTRA_CMAKE_ARGS="-DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \
-. .gitlab-ci/container/build-deqp.sh
-
 DEQP_API=GLES \
 DEQP_TARGET="android" \
 EXTRA_CMAKE_ARGS="-DDEQP_TARGET_TOOLCHAIN=ndk-modern -DANDROID_NDK_PATH=/$ndk -DANDROID_ABI=x86_64 -DDE_ANDROID_API=$ANDROID_SDK_VERSION" \

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

@@ -381,7 +381,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:
     - .android-variables
     - .use-debian/x86_64_test-base

.gitlab-ci/container/lava_build.sh

@@ -305,6 +305,8 @@ rm -rf /apitrace
 
 ############### Build ANGLE
 if [[ "$DEBIAN_ARCH" = "amd64" ]]; then
+  ANGLE_TARGET=linux \
+  ANGLE_ARCH=x64 \
   . .gitlab-ci/container/build-angle.sh
   mv /angle $ROOTFS/.
   rm -rf /angle
@@ -335,9 +337,11 @@ if [ "$BUILD_VK" == "ON" ]; then
   DEQP_TARGET=default \
   . .gitlab-ci/container/build-deqp.sh
 
-  DEQP_API=VK-main \
-  DEQP_TARGET=default \
-  . .gitlab-ci/container/build-deqp.sh
+  if [ "$DEBIAN_ARCH" == "amd64" ]; then
+    DEQP_API=VK-main \
+    DEQP_TARGET=default \
+    . .gitlab-ci/container/build-deqp.sh
+  fi
 fi
 
 rm -rf /VK-GL-CTS

.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-deqp-gl_Allow-running-on-Android-from-the-command-line.patch

-From 6250d347d15502e3b45769edba57ae244e20fb92 Mon Sep 17 00:00:00 2001
-From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
-Date: Fri, 26 Aug 2022 18:24:27 +0200
-Subject: [PATCH 1/2] Allow running on Android from the command line
-
-For testing the Android EGL platform without having to go via the
-Android activity manager, build deqp-egl.
-
-Tests that render to native windows are unsupported, as command line
-programs cannot create windows on Android.
-
-$ cmake -S . -B build/ -DDEQP_TARGET=android -DDEQP_TARGET_TOOLCHAIN=ndk-modern -DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror -DANDROID_NDK_PATH=./android-ndk-r21d -DANDROID_ABI=x86_64 -DDE_ANDROID_API=28 -DGLCTS_GTF_TARGET=gles32 -G Ninja
-$ ninja -C build modules/egl/deqp-egl
-
-Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
----
- CMakeLists.txt                                | 38 ++-----------------
- .../android/tcuAndroidNativeActivity.cpp      | 36 +++++++++---------
- .../platform/android/tcuAndroidPlatform.cpp   | 12 +++++-
- 3 files changed, 34 insertions(+), 52 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 309bdda18..7c833751f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -275,7 +275,7 @@ include_directories(
- 	external/vulkancts/framework/vulkan
- 	)
- 
--if (DE_OS_IS_ANDROID OR DE_OS_IS_IOS)
-+if (DE_OS_IS_IOS)
- 	# On Android deqp modules are compiled as libraries and linked into final .so
- 	set(DEQP_MODULE_LIBRARIES )
- 	set(DEQP_MODULE_ENTRY_POINTS )
-@@ -319,7 +319,7 @@ macro (add_deqp_module MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
- 	set(DEQP_MODULE_LIBRARIES		${DEQP_MODULE_LIBRARIES} PARENT_SCOPE)
- 	set(DEQP_MODULE_ENTRY_POINTS	${DEQP_MODULE_ENTRY_POINTS} PARENT_SCOPE)
- 
--	if (NOT DE_OS_IS_ANDROID AND NOT DE_OS_IS_IOS)
-+	if (NOT DE_OS_IS_IOS)
- 		# Executable target
- 		add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
- 		target_link_libraries(${MODULE_NAME} PUBLIC "${EXECLIBS}" "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
-@@ -341,7 +341,7 @@ macro (add_deqp_module_skip_android MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
- 	add_library("${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}" STATIC ${SRCS})
- 	target_link_libraries("${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}" ${LIBS})
- 
--	if (NOT DE_OS_IS_ANDROID AND NOT DE_OS_IS_IOS)
-+	if (NOT DE_OS_IS_IOS)
- 		# Executable target
- 		add_executable(${MODULE_NAME} ${PROJECT_SOURCE_DIR}/framework/platform/tcuMain.cpp ${ENTRY})
- 		target_link_libraries(${MODULE_NAME} PUBLIC "${EXECLIBS}" "${MODULE_NAME}${MODULE_LIB_TARGET_POSTFIX}")
-@@ -393,37 +393,7 @@ add_subdirectory(external/vulkancts/vkscpc ${MAYBE_EXCLUDE_FROM_ALL})
- add_subdirectory(external/openglcts ${MAYBE_EXCLUDE_FROM_ALL})
- 
- # Single-binary targets
--if (DE_OS_IS_ANDROID)
--	include_directories(executor)
--	include_directories(${PROJECT_BINARY_DIR}/external/vulkancts/framework/vulkan)
--
--	set(DEQP_SRCS
--		framework/platform/android/tcuAndroidMain.cpp
--		framework/platform/android/tcuAndroidJNI.cpp
--		framework/platform/android/tcuAndroidPlatformCapabilityQueryJNI.cpp
--		framework/platform/android/tcuTestLogParserJNI.cpp
--		${DEQP_MODULE_ENTRY_POINTS}
--		)
--
--	set(DEQP_LIBS
--		tcutil-platform
--		xecore
--		${DEQP_MODULE_LIBRARIES}
--		)
--
--	add_library(deqp SHARED ${DEQP_SRCS})
--	target_link_libraries(deqp ${DEQP_LIBS})
--
--	# Separate out the debug information because it's enormous
--	add_custom_command(TARGET deqp POST_BUILD
--		COMMAND ${CMAKE_STRIP} --only-keep-debug -o $<TARGET_FILE:deqp>.debug $<TARGET_FILE:deqp>
--		COMMAND ${CMAKE_STRIP} -g $<TARGET_FILE:deqp>)
--
--	# Needed by OpenGL CTS that defines its own activity but depends on
--	# common Android support code.
--	target_include_directories(deqp PRIVATE framework/platform/android)
--
--elseif (DE_OS_IS_IOS)
-+if (DE_OS_IS_IOS)
- 	# Code sign identity
- 	set(DEQP_IOS_CODE_SIGN_IDENTITY "drawElements" CACHE STRING "Code sign identity for iOS build")
- 
-diff --git a/framework/platform/android/tcuAndroidNativeActivity.cpp b/framework/platform/android/tcuAndroidNativeActivity.cpp
-index 82a9ab699..4eab14a39 100644
---- a/framework/platform/android/tcuAndroidNativeActivity.cpp
-+++ b/framework/platform/android/tcuAndroidNativeActivity.cpp
-@@ -115,23 +115,25 @@ namespace Android
- 
- NativeActivity::NativeActivity(ANativeActivity *activity) : m_activity(activity)
- {
--    activity->instance                              = (void *)this;
--    activity->callbacks->onStart                    = onStartCallback;
--    activity->callbacks->onResume                   = onResumeCallback;
--    activity->callbacks->onSaveInstanceState        = onSaveInstanceStateCallback;
--    activity->callbacks->onPause                    = onPauseCallback;
--    activity->callbacks->onStop                     = onStopCallback;
--    activity->callbacks->onDestroy                  = onDestroyCallback;
--    activity->callbacks->onWindowFocusChanged       = onWindowFocusChangedCallback;
--    activity->callbacks->onNativeWindowCreated      = onNativeWindowCreatedCallback;
--    activity->callbacks->onNativeWindowResized      = onNativeWindowResizedCallback;
--    activity->callbacks->onNativeWindowRedrawNeeded = onNativeWindowRedrawNeededCallback;
--    activity->callbacks->onNativeWindowDestroyed    = onNativeWindowDestroyedCallback;
--    activity->callbacks->onInputQueueCreated        = onInputQueueCreatedCallback;
--    activity->callbacks->onInputQueueDestroyed      = onInputQueueDestroyedCallback;
--    activity->callbacks->onContentRectChanged       = onContentRectChangedCallback;
--    activity->callbacks->onConfigurationChanged     = onConfigurationChangedCallback;
--    activity->callbacks->onLowMemory                = onLowMemoryCallback;
-+    if (activity) {
-+        activity->instance                              = (void *)this;
-+        activity->callbacks->onStart                    = onStartCallback;
-+        activity->callbacks->onResume                   = onResumeCallback;
-+        activity->callbacks->onSaveInstanceState        = onSaveInstanceStateCallback;
-+        activity->callbacks->onPause                    = onPauseCallback;
-+        activity->callbacks->onStop                     = onStopCallback;
-+        activity->callbacks->onDestroy                  = onDestroyCallback;
-+        activity->callbacks->onWindowFocusChanged       = onWindowFocusChangedCallback;
-+        activity->callbacks->onNativeWindowCreated      = onNativeWindowCreatedCallback;
-+        activity->callbacks->onNativeWindowResized      = onNativeWindowResizedCallback;
-+        activity->callbacks->onNativeWindowRedrawNeeded = onNativeWindowRedrawNeededCallback;
-+        activity->callbacks->onNativeWindowDestroyed    = onNativeWindowDestroyedCallback;
-+        activity->callbacks->onInputQueueCreated        = onInputQueueCreatedCallback;
-+        activity->callbacks->onInputQueueDestroyed      = onInputQueueDestroyedCallback;
-+        activity->callbacks->onContentRectChanged       = onContentRectChangedCallback;
-+        activity->callbacks->onConfigurationChanged     = onConfigurationChangedCallback;
-+        activity->callbacks->onLowMemory                = onLowMemoryCallback;
-+    }
- }
- 
- NativeActivity::~NativeActivity(void)
-diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
-index 0472fa615..ff8929409 100644
---- a/framework/platform/android/tcuAndroidPlatform.cpp
-+++ b/framework/platform/android/tcuAndroidPlatform.cpp
-@@ -22,6 +22,7 @@
-  *//*--------------------------------------------------------------------*/
- 
- #include "tcuAndroidPlatform.hpp"
-+#include "tcuAndroidNativeActivity.hpp"
- #include "tcuAndroidUtil.hpp"
- #include "gluRenderContext.hpp"
- #include "egluNativeDisplay.hpp"
-@@ -198,7 +199,7 @@ eglu::NativeWindow *NativeWindowFactory::createWindow(const eglu::WindowParams &
-     Window *window = m_windowRegistry.tryAcquireWindow();
- 
-     if (!window)
--        throw ResourceError("Native window is not available", DE_NULL, __FILE__, __LINE__);
-+        throw NotSupportedError("Native window is not available", DE_NULL, __FILE__, __LINE__);
- 
-     return new NativeWindow(window, params.width, params.height, format);
- }
-@@ -319,6 +320,9 @@ static size_t getTotalSystemMemory(ANativeActivity *activity)
- 
-     try
-     {
-+        if (!activity)
-+            throw tcu::InternalError("No activity (running from command line?");
-+
-         const size_t totalMemory = getTotalAndroidSystemMemory(activity);
-         print("Device has %.2f MiB of system memory\n", static_cast<double>(totalMemory) / static_cast<double>(MiB));
-         return totalMemory;
-@@ -416,3 +420,9 @@ bool Platform::hasDisplay(vk::wsi::Type wsiType) const
- 
- } // namespace Android
- } // namespace tcu
-+
-+tcu::Platform* createPlatform (void)
-+{
-+    tcu::Android::NativeActivity activity(NULL);
-+    return new tcu::Android::Platform(activity);
-+}
--- 
-2.45.2
-

.gitlab-ci/container/patches/build-deqp-gl_Android-prints-to-stdout-instead-of-logcat.patch

-From a602822c53e22e985f942f843ccadbfb64613212 Mon Sep 17 00:00:00 2001
-From: Helen Koike <helen.koike@collabora.com>
-Date: Tue, 27 Sep 2022 12:35:22 -0300
-Subject: [PATCH 2/2] Android prints to stdout instead of logcat
-
-Signed-off-by: Helen Koike <helen.koike@collabora.com>
----
- framework/qphelper/qpDebugOut.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/framework/qphelper/qpDebugOut.c b/framework/qphelper/qpDebugOut.c
-index 6579e9f48..c200c6f6b 100644
---- a/framework/qphelper/qpDebugOut.c
-+++ b/framework/qphelper/qpDebugOut.c
-@@ -98,7 +98,7 @@ void qpDiev (const char* format, va_list args)
- }
- 
- /* print() implementation. */
--#if (DE_OS == DE_OS_ANDROID)
-+#if (0)
- 
- #include <android/log.h>
- 
--- 
-2.42.0
-

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

-From 4f53bcbb597a91bab715bc8d555cfd6c81263ac1 Mon Sep 17 00:00:00 2001
+From bcb1110cc00398dfb501aac83eddbd66d8fae425 Mon Sep 17 00:00:00 2001
 From: Daniel Stone <daniels@collabora.com>
 Date: Wed, 29 Jan 2025 12:50:33 +0000
 Subject: [PATCH] Build: Don't build Vulkan utilities for GL builds
@@ -7,10 +7,11 @@ Change-Id: Ie412f914bb6264ffbd502deea57d80cc11a9948e
 Signed-off-by: Daniel Stone <daniels@collabora.com>
 ---
  framework/platform/CMakeLists.txt             |   9 --
- .../platform/android/tcuAndroidPlatform.cpp   | 118 ------------------
+ .../platform/android/tcuAndroidPlatform.cpp   | 126 +-----------------
+ .../platform/android/tcuAndroidPlatform.hpp   |  14 +-
  framework/platform/lnx/tcuLnxPlatform.cpp     |   9 +-
  .../surfaceless/tcuSurfacelessPlatform.cpp    |  54 --------
- 4 files changed, 1 insertion(+), 189 deletions(-)
+ 5 files changed, 3 insertions(+), 209 deletions(-)
 
 diff --git a/framework/platform/CMakeLists.txt b/framework/platform/CMakeLists.txt
 index ec1deb5c2..49fe412a7 100644
@@ -54,7 +55,7 @@ index ec1deb5c2..49fe412a7 100644
  
  # Always link to glutil as some platforms such as Win32 always support GL
 diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
-index 0472fa615..87033ad56 100644
+index 0472fa615..40f523ee2 100644
 --- a/framework/platform/android/tcuAndroidPlatform.cpp
 +++ b/framework/platform/android/tcuAndroidPlatform.cpp
 @@ -31,7 +31,6 @@
@@ -168,7 +169,17 @@ index 0472fa615..87033ad56 100644
  static size_t getTotalSystemMemory(ANativeActivity *activity)
  {
      const size_t MiB = (size_t)(1 << 20);
-@@ -355,11 +258,6 @@ bool Platform::processEvents(void)
+@@ -338,8 +241,7 @@ static size_t getTotalSystemMemory(ANativeActivity *activity)
+ // Platform
+ 
+ Platform::Platform(NativeActivity &activity)
+-    : m_activity(activity)
+-    , m_totalSystemMemory(getTotalSystemMemory(activity.getNativeActivity()))
++    : m_totalSystemMemory(getTotalSystemMemory(activity.getNativeActivity()))
+ {
+     m_nativeDisplayFactoryRegistry.registerFactory(new NativeDisplayFactory(m_windowRegistry));
+     m_contextFactoryRegistry.registerFactory(new eglu::GLContextFactory(m_nativeDisplayFactoryRegistry));
+@@ -355,16 +257,6 @@ bool Platform::processEvents(void)
      return true;
  }
  
@@ -177,10 +188,15 @@ index 0472fa615..87033ad56 100644
 -    return new VulkanLibrary(libraryPath);
 -}
 -
- void Platform::describePlatform(std::ostream &dst) const
+-void Platform::describePlatform(std::ostream &dst) const
+-{
+-    tcu::Android::describePlatform(m_activity.getNativeActivity(), dst);
+-}
+-
+ void Platform::getMemoryLimits(tcu::PlatformMemoryLimits &limits) const
  {
-     tcu::Android::describePlatform(m_activity.getNativeActivity(), dst);
-@@ -398,21 +296,5 @@ void Platform::getMemoryLimits(tcu::PlatformMemoryLimits &limits) const
+     // Worst-case estimates
+@@ -398,21 +290,5 @@ void Platform::getMemoryLimits(tcu::PlatformMemoryLimits &limits) const
      limits.devicePageTableHierarchyLevels    = 3;
  }
  
@@ -202,6 +218,53 @@ index 0472fa615..87033ad56 100644
 -
  } // namespace Android
  } // namespace tcu
+diff --git a/framework/platform/android/tcuAndroidPlatform.hpp b/framework/platform/android/tcuAndroidPlatform.hpp
+index 32cc9068c..3c3f02d98 100644
+--- a/framework/platform/android/tcuAndroidPlatform.hpp
++++ b/framework/platform/android/tcuAndroidPlatform.hpp
+@@ -27,7 +27,6 @@
+ #include "tcuPlatform.hpp"
+ #include "egluPlatform.hpp"
+ #include "gluPlatform.hpp"
+-#include "vkPlatform.hpp"
+ #include "tcuAndroidWindow.hpp"
+ #include "tcuAndroidNativeActivity.hpp"
+ 
+@@ -36,7 +35,7 @@ namespace tcu
+ namespace Android
+ {
+ 
+-class Platform : public tcu::Platform, private eglu::Platform, private glu::Platform, private vk::Platform
++class Platform : public tcu::Platform, private eglu::Platform, private glu::Platform
+ {
+ public:
+     Platform(NativeActivity &activity);
+@@ -52,10 +51,6 @@ public:
+     {
+         return static_cast<const eglu::Platform &>(*this);
+     }
+-    virtual const vk::Platform &getVulkanPlatform(void) const
+-    {
+-        return static_cast<const vk::Platform &>(*this);
+-    }
+     virtual void getMemoryLimits(tcu::PlatformMemoryLimits &limits) const;
+ 
+     WindowRegistry &getWindowRegistry(void)
+@@ -63,14 +58,7 @@ public:
+         return m_windowRegistry;
+     }
+ 
+-    // Vulkan Platform API
+-    vk::Library *createLibrary(const char *libraryPath) const;
+-    void describePlatform(std::ostream &dst) const;
+-    vk::wsi::Display *createWsiDisplay(vk::wsi::Type wsiType) const;
+-    bool hasDisplay(vk::wsi::Type wsiType) const;
+-
+ private:
+-    NativeActivity &m_activity;
+     WindowRegistry m_windowRegistry;
+     const size_t m_totalSystemMemory;
+ };
 diff --git a/framework/platform/lnx/tcuLnxPlatform.cpp b/framework/platform/lnx/tcuLnxPlatform.cpp
 index 8c0a3ef06..6b1a4985a 100644
 --- a/framework/platform/lnx/tcuLnxPlatform.cpp
@@ -324,5 +387,5 @@ index 1cea9dd97..3d5bd8b62 100644
  
  class ContextFactory : public glu::ContextFactory
 -- 
-2.48.1
+2.47.2
 

.gitlab-ci/cuttlefish-runner.sh

@@ -148,6 +148,17 @@ $ADB shell rm -f /vendor/lib64/egl/libEGL_emulation.so
 $ADB shell rm -f /vendor/lib64/egl/libGLESv1_CM_emulation.so
 $ADB shell rm -f /vendor/lib64/egl/libGLESv2_emulation.so
 
+# Remove built-in ANGLE, we'll supply our own if needed
+$ADB shell rm -f /vendor/lib64/egl/libEGL_angle.so
+$ADB shell rm -f /vendor/lib64/egl/libGLESv1_CM_angle.so
+$ADB shell rm -f /vendor/lib64/egl/libGLESv2_angle.so
+
+if [ -n "$USE_ANGLE" ]; then
+  $ADB push /angle/libEGL_angle.so /vendor/lib64/egl/libEGL_angle.so
+  $ADB push /angle/libGLESv1_CM_angle.so /vendor/lib64/egl/libGLESv1_CM_angle.so
+  $ADB push /angle/libGLESv2_angle.so /vendor/lib64/egl/libGLESv2_angle.so
+fi
+
 # Check what GLES implementation Surfaceflinger is using before copying the new mesa libraries
 while [ "$($ADB shell dumpsys SurfaceFlinger | grep GLES:)" = "" ] ; do sleep 1; done
 $ADB shell dumpsys SurfaceFlinger | grep GLES
@@ -159,10 +170,19 @@ $ADB shell start
 # Check what GLES implementation Surfaceflinger is using after copying the new mesa libraries
 while [ "$($ADB shell dumpsys SurfaceFlinger | grep GLES:)" = "" ] ; do sleep 1; done
 MESA_RUNTIME_VERSION="$($ADB shell dumpsys SurfaceFlinger | grep GLES:)"
-MESA_BUILD_VERSION=$(cat "$INSTALL/VERSION")
-if ! printf "%s" "$MESA_RUNTIME_VERSION" | grep "${MESA_BUILD_VERSION}$"; then
-    echo "Fatal: Android is loading a wrong version of the Mesa3D libs: ${MESA_RUNTIME_VERSION}" 1>&2
+
+if [ "$USE_ANGLE" = 1 ]; then
+  ANGLE_HASH=$(head -c 12 /angle/hash)
+  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
+  fi
+else
+  MESA_BUILD_VERSION=$(cat "$INSTALL/VERSION")
+  if ! printf "%s" "$MESA_RUNTIME_VERSION" | grep --quiet "${MESA_BUILD_VERSION}$"; then
+     echo "Fatal: Android is loading a wrong version of the Mesa3D libs: ${MESA_RUNTIME_VERSION}" 1>&2
+     exit 1
+  fi
 fi
 
 BASELINE=""

.gitlab-ci/image-tags.yml

@@ -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: "20250130-vvless"
-   DEBIAN_TEST_GL_TAG: "20250131-piglit-fc"
-   DEBIAN_TEST_VK_TAG: "20250131-piglit-fc"
-   KERNEL_ROOTFS_TAG: "20250129-adlp-fw"
+   DEBIAN_TEST_ANDROID_TAG: "20250206-right-angle"
+   DEBIAN_TEST_GL_TAG: "20250204-fix-deqp"
+   DEBIAN_TEST_VK_TAG: "20250204-fix-deqp"
+   KERNEL_ROOTFS_TAG: "20250206-right-angle"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20250129-lavacli"

docs/envvars.rst

@@ -200,10 +200,11 @@ Core Mesa environment variables
 .. envvar:: MESA_SHADER_CACHE_DIR
 
    if set, determines the directory to be used for the on-disk cache of
-   compiled shader programs. If this variable is not set, then the cache
-   will be stored in ``$XDG_CACHE_HOME/mesa_shader_cache_db`` (if that
-   variable is set), or else within ``.cache/mesa_shader_cache_db`` within
-   the user's home directory.
+   compiled shader programs. If set then the cache will be stored in
+   ``$MESA_SHADER_CACHE_DIR/mesa_shader_cache_db``. If this variable is not
+   set, then the cache will be stored in
+   ``$XDG_CACHE_HOME/mesa_shader_cache_db`` (if that variable is set), or else
+   within ``.cache/mesa_shader_cache_db`` within the user's home directory.
 
 .. envvar:: MESA_SHADER_CACHE_SHOW_STATS
 
@@ -218,9 +219,10 @@ Core Mesa environment variables
    cache DBs via :envvar:`MESA_DISK_CACHE_READ_ONLY_FOZ_DBS` or
    :envvar:`MESA_DISK_CACHE_READ_ONLY_FOZ_DBS_DYNAMIC_LIST`. This
    implementation does not support cache size limits via
-   :envvar:`MESA_SHADER_CACHE_MAX_SIZE`. If
-   :envvar:`MESA_SHADER_CACHE_DIR` is not set, the cache will be stored
-   in ``$XDG_CACHE_HOME/mesa_shader_cache_sf`` (if that variable is set)
+   :envvar:`MESA_SHADER_CACHE_MAX_SIZE`. If :envvar:`MESA_SHADER_CACHE_DIR`
+   is set, the cache will be stored in
+   ``$MESA_SHADER_CACHE_DIR/mesa_shader_cache_sf``, or else within
+   ``$XDG_CACHE_HOME/mesa_shader_cache_sf`` (if that variable is set)
    or else within ``.cache/mesa_shader_cache_sf`` within the user's home
    directory.
 
@@ -229,8 +231,9 @@ Core Mesa environment variables
    if set to 1, enables the multi file on-disk shader cache implementation
    instead of the default Mesa-DB cache implementation.
    This implementation increases the overall disk usage.
-   If :envvar:`MESA_SHADER_CACHE_DIR` is not set, the cache will be stored
-   in ``$XDG_CACHE_HOME/mesa_shader_cache`` (if that variable is set)
+   If :envvar:`MESA_SHADER_CACHE_DIR` is set, the cache will be stored in
+   ``$MESA_SHADER_CACHE_DIR/mesa_shader_cache``, or else within
+   ``$XDG_CACHE_HOME/mesa_shader_cache`` (if that variable is set)
    or else within ``.cache/mesa_shader_cache`` within the user's home
    directory.
 

docs/features.txt

@@ -479,7 +479,7 @@ Vulkan 1.2 -- all DONE: anv, nvk, tu, vn
   VK_EXT_host_query_reset                               DONE (anv, hasvk, lvp, nvk, panvk, pvr, radv, tu, v3dv, vn)
   VK_EXT_sampler_filter_minmax                          DONE (anv, lvp, nvk, panvk/v10+, radv, tu, vn)
   VK_EXT_scalar_block_layout                            DONE (anv, dzn, hasvk, lvp, nvk, panvk, pvr, radv/gfx7+, tu, vn, v3dv/vc7+)
-  VK_EXT_separate_stencil_usage                         DONE (anv, dzn, hasvk, lvp, nvk, radv, tu, v3dv, vn)
+  VK_EXT_separate_stencil_usage                         DONE (anv, dzn, hasvk, lvp, nvk, panvk, radv, tu, v3dv, vn)
   VK_EXT_shader_viewport_index_layer                    DONE (anv, hasvk, lvp, nvk, radv, tu, vn)
 
 Vulkan 1.3 -- all DONE: anv, lvp, nvk, radv, tu, vn, v3dv

docs/relnotes/new_features.txt

@@ -3,3 +3,4 @@ storagePushConstant16 on panvk
 storageInputOutput16 on panvk
 VK_KHR_depth_stencil_resolve on panvk
 VK_KHR_separate_depth_stencil_layouts on panvk
+VK_EXT_separate_stencil_usage on panvk

src/amd/ci/angle-radv-stoney-aco-fails.txt

@@ -95,3 +95,9 @@ KHR-GLES31.core.texture_buffer.texture_buffer_max_size,Fail
 KHR-GLES31.core.shader_image_load_store.basic-allTargets-loadStoreCS,Fail
 dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_bgra_depth_component16,Fail
 dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_bgra,Fail
+
+# New failures after fixing the fraction
+dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_bgra_depth_component16,Fail
+dEQP-GLES2.functional.fbo.render.recreate_depthbuffer.rebind_rbo_bgra_depth_component16,Fail
+dEQP-GLES2.functional.fbo.render.resize.rbo_bgra_depth_component16,Fail
+dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_bgra_depth_component16,Fail

src/amd/ci/gitlab-ci-inc.yml

@@ -81,13 +81,21 @@
     - !reference [.collabora-farm-rules, rules]
     - !reference [.radv-rules, rules]
 
-.radv-collabora-rules-restricted:
+.radv-collabora-restricted-rules:
   stage: amd
   rules:
     - !reference [.test, rules]
     - !reference [.restricted-rules, rules]
     - !reference [.radv-collabora-rules, rules]
 
+.radv-collabora-manual-rules:
+  stage: amd-postmerge
+  extends: .no-auto-retry
+  rules:
+    - !reference [.test, rules]
+    - !reference [.collabora-farm-manual-rules, rules]
+    - !reference [.radv-manual-rules, rules]
+
 .radv-valve-rules:
   stage: amd
   rules:
@@ -306,9 +314,9 @@
 
 .tahiti-test-valve:
   variables:
-    FDO_CI_CONCURRENT: 8
+    FDO_CI_CONCURRENT: 24
     RUNNER_FARM_LOCATION: mupuf
-    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=8g'
+    B2C_KERNEL_CMDLINE_EXTRAS: 'b2c.swap=16g'
   tags:
     - farm:$RUNNER_FARM_LOCATION
     - amdgpu:codename:TAHITI

src/amd/ci/gitlab-ci.yml

@@ -25,10 +25,11 @@ radv-stoney-angle:
 radv-stoney-angle-full:
   extends:
     - radv-stoney-angle
-    - .radv-valve-manual-rules
+    - .radv-collabora-manual-rules
   parallel: 2
   variables:
     DEQP_SUITE: radv-stoney-angle-full
+    DEQP_FRACTION: 1
 
 radeonsi-stoney-gl:
   extends:
@@ -94,7 +95,7 @@ radv-raven-traces-restricted:
     - .lava-piglit-traces:x86_64
     - .radv-raven-test:x86_64
     - .lava-lenovo-TPad-C13-Yoga-zork:x86_64
-    - .radv-collabora-rules-restricted
+    - .radv-collabora-restricted-rules
   variables:
     HWCI_START_WESTON: 1
     PIGLIT_REPLAY_ANGLE_TAG: "2023-02-10-1"