ci: update to vulkan-cts-1.3.6.3
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24947>
This commit is contained in:
Samuel Pitoiset
committed by
Marge Bot
Marge Bot
parent
f4fecdad72
commit
a217c5c58c
@@ -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.5.2 \
|
||||
-b vulkan-cts-1.3.6.3 \
|
||||
--depth 1 \
|
||||
/VK-GL-CTS
|
||||
pushd /VK-GL-CTS
|
||||
@@ -26,53 +26,27 @@ pushd /VK-GL-CTS
|
||||
# patches.
|
||||
|
||||
cts_commits_to_backport=(
|
||||
# sync fix for SSBO writes
|
||||
44f1be32fe6bd2a7de7b9169fc71cc44e0b26124
|
||||
|
||||
# sync fix for KHR-GL46.multi_bind.dispatch_bind_image_textures
|
||||
db6c9e295ab38054ace425cb75ff966719ccc609
|
||||
|
||||
# VK robustness barriers fix
|
||||
6052f21c4d6077438d644f525c10cc58dcdf25bf
|
||||
|
||||
# correctness fixes for zink validation fails
|
||||
1923cbc89ed3969a3afe7c6926124b51157902e1
|
||||
af3a979c49dc65f8809c27660405ae3a76c7da4a
|
||||
|
||||
# GL/GLES vertex_attrib_binding.advanced-largeStrideAndOffsetsNewAndLegacyAPI fix
|
||||
bdb456dcf85e34fced872ebdaf06f6b73451f99c
|
||||
|
||||
# KHR-GLES31.core.compute_shader.max fix
|
||||
7aa3ebb49d07982f5c44edd4799edb5a894567e9
|
||||
|
||||
# GL arrays_of_arrays perf fix
|
||||
b481dada59734e8e34050fe884ba6d627d9e5c54
|
||||
|
||||
# GL shadow samplers require depth compares fix
|
||||
a8bc242ec234bf8d7df8b4eec1eeccab4e401288
|
||||
|
||||
# GL PolygonOffsetClamp fix
|
||||
1f2feb2388da88b4e46eba55547d50856467cc20
|
||||
|
||||
# KHR-GL46.texture_view.view_sampling fix
|
||||
aca29fb9553ebe28094513ce18bb46bad138cf46
|
||||
|
||||
# video validation fails
|
||||
4cc3980a86ba5b7fe6e76b559cc1a9cb5fd1b253
|
||||
a7a2ce442db51ca058ce051de7e09d62db44ae81
|
||||
|
||||
# Check for robustness before testing it
|
||||
ee7138d8adf5ed3c4845e5ac2553c4f9697be9d8
|
||||
|
||||
# dEQP-VK.wsi.acquire_drm_display.*invalid_fd
|
||||
98ad9402e7d94030d1689fd59135da7a2f52384c
|
||||
|
||||
# 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[@]}"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From bf8ada0d15f94824ee1643d4e17a66dffdbaf2e5 Mon Sep 17 00:00:00 2001
|
||||
From ff48eb81b574dc119647a0b6c8df4d978da7e42a 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
|
||||
@@ -13,7 +13,6 @@ $ cmake -S . -B build/ -DDEQP_TARGET=android -DDEQP_TARGET_TOOLCHAIN=ndk-modern
|
||||
$ ninja -C build modules/egl/deqp-egl
|
||||
|
||||
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
|
||||
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
|
||||
---
|
||||
CMakeLists.txt | 36 ++-----------------
|
||||
.../android/tcuAndroidNativeActivity.cpp | 36 ++++++++++---------
|
||||
@@ -21,11 +20,11 @@ Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
|
||||
3 files changed, 33 insertions(+), 51 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1ff2bb9..8c76abb 100644
|
||||
index 358f2c875..5e4644cc2 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -249,7 +249,7 @@ include_directories(
|
||||
external/vulkancts/framework/vulkan/generated/vulkan
|
||||
@@ -247,7 +247,7 @@ include_directories(
|
||||
external/vulkancts/framework/vulkan
|
||||
)
|
||||
|
||||
-if (DE_OS_IS_ANDROID OR DE_OS_IS_IOS)
|
||||
@@ -33,7 +32,7 @@ index 1ff2bb9..8c76abb 100644
|
||||
# On Android deqp modules are compiled as libraries and linked into final .so
|
||||
set(DEQP_MODULE_LIBRARIES )
|
||||
set(DEQP_MODULE_ENTRY_POINTS )
|
||||
@@ -293,7 +293,7 @@ macro (add_deqp_module MODULE_NAME SRCS LIBS EXECLIBS ENTRY)
|
||||
@@ -291,7 +291,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)
|
||||
|
||||
@@ -42,7 +41,7 @@ index 1ff2bb9..8c76abb 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}")
|
||||
@@ -367,37 +367,7 @@ add_subdirectory(external/vulkancts/vkscpc)
|
||||
@@ -365,37 +365,7 @@ add_subdirectory(external/vulkancts/vkscpc)
|
||||
add_subdirectory(external/openglcts)
|
||||
|
||||
# Single-binary targets
|
||||
@@ -82,7 +81,7 @@ index 1ff2bb9..8c76abb 100644
|
||||
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 6f8cd8f..b83e30f 100644
|
||||
index 6f8cd8fc5..b83e30f41 100644
|
||||
--- a/framework/platform/android/tcuAndroidNativeActivity.cpp
|
||||
+++ b/framework/platform/android/tcuAndroidNativeActivity.cpp
|
||||
@@ -116,23 +116,25 @@ namespace Android
|
||||
@@ -129,7 +128,7 @@ index 6f8cd8f..b83e30f 100644
|
||||
|
||||
NativeActivity::~NativeActivity (void)
|
||||
diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp
|
||||
index 69ab384..d7288f6 100644
|
||||
index b8a35898c..cf02e6b70 100644
|
||||
--- a/framework/platform/android/tcuAndroidPlatform.cpp
|
||||
+++ b/framework/platform/android/tcuAndroidPlatform.cpp
|
||||
@@ -22,6 +22,7 @@
|
||||
@@ -149,7 +148,7 @@ index 69ab384..d7288f6 100644
|
||||
|
||||
return new NativeWindow(window, params.width, params.height, format);
|
||||
}
|
||||
@@ -286,6 +287,9 @@ static size_t getTotalSystemMemory (ANativeActivity* activity)
|
||||
@@ -292,6 +293,9 @@ static size_t getTotalSystemMemory (ANativeActivity* activity)
|
||||
|
||||
try
|
||||
{
|
||||
@@ -159,7 +158,7 @@ index 69ab384..d7288f6 100644
|
||||
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;
|
||||
@@ -382,3 +386,9 @@ bool Platform::hasDisplay (vk::wsi::Type wsiType) const
|
||||
@@ -388,3 +392,9 @@ bool Platform::hasDisplay (vk::wsi::Type wsiType) const
|
||||
|
||||
} // Android
|
||||
} // tcu
|
||||
@@ -170,5 +169,5 @@ index 69ab384..d7288f6 100644
|
||||
+ return new tcu::Android::Platform(activity);
|
||||
+}
|
||||
--
|
||||
2.39.1
|
||||
2.41.0
|
||||
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
From c2d5252f4a8be94720235feb9e358ecb0a2e8e11 Mon Sep 17 00:00:00 2001
|
||||
From 30ea0729517d1d4708617b4b295ba1ffd09e6efc 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>
|
||||
Signed-off-by: David Heidelberg <david.heidelberg@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 6579e9f..c200c6f 100644
|
||||
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)
|
||||
@@ -23,5 +22,5 @@ index 6579e9f..c200c6f 100644
|
||||
#include <android/log.h>
|
||||
|
||||
--
|
||||
2.39.1
|
||||
2.41.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user