From 174742fd6677a15a633b9fb67fc5641654db7653 Mon Sep 17 00:00:00 2001 From: angle-autoroll Date: Sun, 18 Jun 2023 13:07:00 +0000 Subject: [PATCH] Roll VK-GL-CTS from 7fcb3c6e0082 to f29bd2feeaff (19 revisions) Suppress dEQP-EGL failures. https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS.git/+log/7fcb3c6e0082..f29bd2feeaff 2023-06-18 lorenzo@khronosgroup.org Merge vk-gl-cts/github-main into vk-gl-cts/main 2023-06-16 lorenzo@khronosgroup.org Merge vk-gl-cts/opengl-es-cts-3.2.9 into vk-gl-cts/main 2023-06-16 piotr.byszewski@mobica.com Split pipeline.txt in vksc-default 2023-06-16 lorenzo@khronosgroup.org Merge vk-gl-cts/vulkan-cts-1.3.6 into vk-gl-cts/main 2023-06-16 alexander.galazin@imgtec.com Fix check_build_sanity.py error 2023-06-16 lorenzo@khronosgroup.org Add missing line in AndroidGen.mk for vktFragmentShadingRateMiscTests.cpp 2023-06-16 rgarcia@igalia.com Test FSR in a pipeline without fragment shader 2023-06-16 ziga@lunarg.com Add xfb test drawing outside of xfb begin 2023-06-16 piotr.byszewski@mobica.com Test RT interaction with flags added by GPL 2023-06-16 rgarcia@igalia.com Test gl_SampleMaskIn with sample shading 2023-06-16 rgarcia@igalia.com Test enabling and disabling VRS statically 2023-06-16 rgarcia@igalia.com Test allocation and binding offsets with index buffers 2023-06-16 pdaniell@nvidia.com Remove the "Error:" prefix with NotSupported results 2023-06-16 jenatali@microsoft.com Fix skipping when synchronization2 is unsupported on Windows 2023-06-16 gleese@broadcom.com Remove 64-bit test code for builtins which don't support it 2023-06-16 jenatali@microsoft.com Don't include windows.h in the vk namespace 2023-06-16 rgarcia@igalia.com Disallow direct linking of GLES libraries by default 2023-06-16 lorenzo@khronosgroup.org Merge vk-gl-cts/vulkan-cts-1.3.6 into vk-gl-cts/main 2023-06-15 younggwan.kim@arm.com Merge dev/EXT_shader_tile_image into main If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/vk-gl-cts-angle-autoroll Please CC angle-team@google.com,syoussefi@google.com on the revert to ensure that a human is aware of the problem. To file a bug in ANGLE: https://bugs.chromium.org/p/angleproject/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Bug: angleproject:8214 Change-Id: I84598fb784adf1e30abbeaac3c53dcd97108d58a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4624553 Reviewed-by: Shahbaz Youssefi Commit-Queue: Shahbaz Youssefi --- DEPS | 2 +- .../GL_CTS_(dEQP)_build_files.json | 6 ++--- .../deqp_egl_test_expectations.txt | 27 ++++++++++++++++++- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 4fd2e04b7..5ba2a27c7 100644 --- a/DEPS +++ b/DEPS @@ -49,7 +49,7 @@ vars = { 'dummy_checkout_chromium': False, # Current revision of VK-GL-CTS (a.k.a dEQP). - 'vk_gl_cts_revision': '7fcb3c6e0082d5a9c58b33ce9405ca3e9eec4471', + 'vk_gl_cts_revision': 'f29bd2feeafff80013d4b52a8abbc960cbbb7dbd', # Current revision of googletest. # Note: this dep cannot be auto-rolled b/c of nesting. diff --git a/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json b/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json index 0326b6542..af8733a86 100644 --- a/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json +++ b/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json @@ -6,7 +6,7 @@ "src/tests/deqp_support/deqp_data_autogen.gni": "66f7f626b3f33cd2aaaceb0592680be9", "third_party/VK-GL-CTS/src/CMakeLists.txt": - "c9b04210665e82d0f8ab9e14572d7d19", + "3c144eb9b8eb6392d01500fa5f9803c2", "third_party/VK-GL-CTS/src/execserver/CMakeLists.txt": "38aa187592e6ef9a331fc1ea313fc68d", "third_party/VK-GL-CTS/src/executor/CMakeLists.txt": @@ -76,7 +76,7 @@ "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/fragment_shading_barycentric/CMakeLists.txt": "994299a54be2b1fd84770b5b1b1e27d6", "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/fragment_shading_rate/CMakeLists.txt": - "62b3ce1059ed510900e5afd7b72149d2", + "70bd1230fad695239b2a5e9019737eaf", "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/geometry/CMakeLists.txt": "0d0cf6c5e43e63f73dbba0a511a50127", "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/image/CMakeLists.txt": @@ -102,7 +102,7 @@ "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/query_pool/CMakeLists.txt": "63c544581c8550678f8f30571fbf2619", "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/rasterization/CMakeLists.txt": - "b50107851a5a513d4a3ebcb7b25c051b", + "4816dc26f1286edf40c52e1daa03d06d", "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/ray_query/CMakeLists.txt": "88560ebe73d803a5d35b8889f5f600b0", "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/ray_tracing/CMakeLists.txt": diff --git a/src/tests/deqp_support/deqp_egl_test_expectations.txt b/src/tests/deqp_support/deqp_egl_test_expectations.txt index 1a632f06c..796b80782 100644 --- a/src/tests/deqp_support/deqp_egl_test_expectations.txt +++ b/src/tests/deqp_support/deqp_egl_test_expectations.txt @@ -70,12 +70,24 @@ 1340 WIN : dEQP-EGL.functional.resize.back_buffer.* = SKIP 1340 WIN : dEQP-EGL.functional.resize.pixel_density.* = SKIP +// Windows D3D11 failures +8214 WIN D3D11 : dEQP-EGL.functional.color_clears.multi_thread.gles2.other = SKIP +8214 WIN D3D11 : dEQP-EGL.functional.color_clears.multi_thread.gles3.other = SKIP +8214 WIN D3D11 : dEQP-EGL.functional.render.multi_thread.gles2.other = SKIP +8214 WIN D3D11 : dEQP-EGL.functional.render.multi_thread.gles2_gles3.other = SKIP +8214 WIN D3D11 : dEQP-EGL.functional.render.multi_thread.gles3.other = SKIP + // Windows OpenGL failures 2546 WIN : dEQP-EGL.functional.query_surface.simple.pbuffer.rgba8888_depth_stencil = FAIL 2546 WIN : dEQP-EGL.functional.thread_cleanup.* = SKIP // Windows Vulkan failures 2716 WIN VULKAN : dEQP-EGL.functional.preserve_swap.no_preserve.* = FAIL +8214 WIN VULKAN : dEQP-EGL.functional.color_clears.multi_thread.gles2.other = SKIP +8214 WIN VULKAN : dEQP-EGL.functional.color_clears.multi_thread.gles3.other = SKIP +8214 WIN VULKAN : dEQP-EGL.functional.render.multi_thread.gles2.other = SKIP +8214 WIN VULKAN : dEQP-EGL.functional.render.multi_thread.gles2_gles3.other = SKIP +8214 WIN VULKAN : dEQP-EGL.functional.render.multi_thread.gles3.other = SKIP // Linux failures 2546 LINUX : dEQP-EGL.functional.negative_api.copy_buffers = SKIP @@ -129,8 +141,21 @@ 6277 PIXEL4ORXL VULKAN : dEQP-EGL.functional.image.render_multiple_contexts.gles2_android_native_rgb8_texture = FAIL // Pixel 6 Vulkan -// These fail on the Android S bots, but pass on pre-release Android T drivers: 6899 PIXEL6 VULKAN : dEQP-EGL.functional.query_context.*.rgb888_window = FAIL +8214 PIXEL6 VULKAN : dEQP-EGL.functional.color_clears.multi_thread.gles2.other = SKIP +8214 PIXEL6 VULKAN : dEQP-EGL.functional.color_clears.multi_thread.gles3.other = SKIP +8214 PIXEL6 VULKAN : dEQP-EGL.functional.render.multi_thread.gles2.other = SKIP +8214 PIXEL6 VULKAN : dEQP-EGL.functional.render.multi_thread.gles2_gles3.other = SKIP +8214 PIXEL6 VULKAN : dEQP-EGL.functional.render.multi_thread.gles3.other = SKIP +8214 PIXEL6 VULKAN : dEQP-EGL.functional.color_clears.multi_context.gles2.other = SKIP +8214 PIXEL6 VULKAN : dEQP-EGL.functional.color_clears.multi_context.gles3.other = SKIP +8214 PIXEL6 VULKAN : dEQP-EGL.functional.color_clears.single_context.gles2.other = SKIP +8214 PIXEL6 VULKAN : dEQP-EGL.functional.color_clears.single_context.gles3.other = SKIP +8214 PIXEL6 VULKAN : dEQP-EGL.functional.render.multi_context.gles2.other = SKIP +8214 PIXEL6 VULKAN : dEQP-EGL.functional.render.multi_context.gles2_gles3.other = SKIP +8214 PIXEL6 VULKAN : dEQP-EGL.functional.render.multi_context.gles3.other = SKIP +8214 PIXEL6 VULKAN : dEQP-EGL.functional.render.single_context.gles2.other = SKIP +8214 PIXEL6 VULKAN : dEQP-EGL.functional.render.single_context.gles3.other = SKIP // render_sample_texture_array tests failing on some configurations on bots 7506 PIXEL4ORXL VULKAN : dEQP-EGL.functional.image.create.gles3_android_native_array_*_render_sample_texture_array = FAIL