ci: update CTS to vulkan-cts-1.3.7.0

This contains many new tests, especially shader object tests.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25476>

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

@@ -14,7 +14,7 @@ git config --global user.email "mesa@example.com"
 git config --global user.name "Mesa CI"
 git clone \
     https://github.com/KhronosGroup/VK-GL-CTS.git \
-    -b vulkan-cts-1.3.6.3 \
+    -b vulkan-cts-1.3.7.0 \
     --depth 1 \
     /VK-GL-CTS
 pushd /VK-GL-CTS
@@ -26,27 +26,6 @@ pushd /VK-GL-CTS
 # patches.
 
 cts_commits_to_backport=(
-        # GL/GLES vertex_attrib_binding.advanced-largeStrideAndOffsetsNewAndLegacyAPI fix
-        bdb456dcf85e34fced872ebdaf06f6b73451f99c
-
-        # GL arrays_of_arrays perf fix
-        b481dada59734e8e34050fe884ba6d627d9e5c54
-
-        # Test alpha-less 10bit formats correctly in wide_color tests
-        # Fixes dEQP-EGL.functional.wide_color.*_888_colorspace_*
-        dacf752adf388ce4399733ee9b4a3c8a4f317990
-
-        # KHR-GLES3.packed_pixels.*snorm
-        46158c2a1f570aab0dcefba461ddc879323367d5
-
-        # Fix problems when buffer_storage not supported
-        148a65182d88ee6c1c959a3b3cf75df22a3eae82
-
-        # surfaceless: Fix shared contexts and implement makeCurrent
-        3b9859deb22712b8b927dce1fac0b40008202877
-
-        # Don't attempt to test linear-filtered depth border clamping on ES.
-        3b3c101a06f1e4fc6acd3d6b40c813cd1bdc25ef
 )
 
 for commit in "${cts_commits_to_backport[@]}"

.gitlab-ci/container/patches/build-deqp_Allow-running-on-Android-from-the-command-line.patch

@@ -1,4 +1,4 @@
-From ff48eb81b574dc119647a0b6c8df4d978da7e42a Mon Sep 17 00:00:00 2001
+From dc97ee83a813f6b170079ddf2a04bbb06221a5a7 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
@@ -20,10 +20,10 @@ Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
  3 files changed, 33 insertions(+), 51 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 358f2c875..5e4644cc2 100644
+index f9c61d0db..d6ad2990b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -247,7 +247,7 @@ include_directories(
+@@ -272,7 +272,7 @@ include_directories(
  	external/vulkancts/framework/vulkan
  	)
  
@@ -32,7 +32,7 @@ index 358f2c875..5e4644cc2 100644
  	# On Android deqp modules are compiled as libraries and linked into final .so
  	set(DEQP_MODULE_LIBRARIES )
  	set(DEQP_MODULE_ENTRY_POINTS )
-@@ -291,7 +291,7 @@ macro (add_deqp_module MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
+@@ -316,7 +316,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)
  
@@ -41,8 +41,8 @@ index 358f2c875..5e4644cc2 100644
  		# 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}")
-@@ -365,37 +365,7 @@ add_subdirectory(external/vulkancts/vkscpc)
- add_subdirectory(external/openglcts)
+@@ -390,37 +390,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)
@@ -169,5 +169,5 @@ index b8a35898c..cf02e6b70 100644
 +	return new tcu::Android::Platform(activity);
 +}
 -- 
-2.41.0
+2.42.0
 

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

@@ -1,4 +1,4 @@
-From 30ea0729517d1d4708617b4b295ba1ffd09e6efc Mon Sep 17 00:00:00 2001
+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
@@ -22,5 +22,5 @@ index 6579e9f48..c200c6f6b 100644
  #include <android/log.h>
  
 -- 
-2.41.0
+2.42.0
 

.gitlab-ci/image-tags.yml

@@ -21,14 +21,14 @@ 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: "2023-10-13-rust-1.66"
-   DEBIAN_X86_64_TEST_GL_TAG: "2023-10-13-rust-1.66"
-   DEBIAN_X86_64_TEST_VK_TAG: "2023-10-13-rust-1.66"
+   DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-10-15-deqp"
+   DEBIAN_X86_64_TEST_GL_TAG: "2023-10-15-deqp"
+   DEBIAN_X86_64_TEST_VK_TAG: "2023-10-15-deqp"
 
    ALPINE_X86_64_BUILD_TAG: "2023-10-04-ephemeral"
    ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"
    FEDORA_X86_64_BUILD_TAG: "2023-08-04-shader-db"
-   KERNEL_ROOTFS_TAG: "2023-10-12-virglrenderer"
+   KERNEL_ROOTFS_TAG: "2023-10-13-deqp"
    KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"