From a2b0dd80f364950181bb88b8925f6ab4006adb73 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Tue, 10 Mar 2026 15:53:50 +0100 Subject: [PATCH] ci: Uprev GL & GLES CTS Signed-off-by: Valentine Burley Part-of: --- .gitlab-ci/container/build-deqp.sh | 10 ++++---- .gitlab-ci/image-tags.yml | 4 ++-- .../drivers/virgl/ci/virpipe-gl-fails.txt | 24 ++++++++++++++++++- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh index dec2c490108..3e1b96f2b22 100755 --- a/.gitlab-ci/container/build-deqp.sh +++ b/.gitlab-ci/container/build-deqp.sh @@ -25,8 +25,8 @@ set -x DEQP_MAIN_COMMIT=4d3bedc74e2258c483cf968753207cff84d9e4fc DEQP_VK_VERSION=1.4.4.2 -DEQP_GL_VERSION=4.6.7.0 -DEQP_GLES_VERSION=3.2.13.0 +DEQP_GL_VERSION=4.6.8.0 +DEQP_GLES_VERSION=3.2.14.0 # Patches to VulkanCTS may come from commits in their repo (listed in # cts_commits_to_backport) or patch files stored in our repo (in the patch @@ -66,12 +66,10 @@ gl_cts_patch_files=( # shellcheck disable=SC2034 # GLES builds also EGL gles_cts_commits_to_backport=( - # CMake: Include FindPkgConfig before using pkg_check_modules() - e09e0a210b041d0bf7b525620d0068eab3ffa66a - # Add an option to print to logcat in Android executable builds - fc51668efdfd0dffa30b3eddee34aa26172969fb # Fix EGL render tests for rgba16 and rgb16 unorm fixed point b5ed8718f19492781f8e9be3eb9d3346e961efa9 + # Fix glGetnUniform* error codes when bufSize < 0 + 34259553e0cc77061465ae0c4bcd4c4658a0fb4a ) # shellcheck disable=SC2034 diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 41aa26752bf..b5ac85a7a42 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -23,8 +23,8 @@ variables: DEBIAN_BUILD_TAG: "20260309-D3D619" DEBIAN_TEST_BASE_TAG: "20260201-deqp-runner" - DEBIAN_TEST_ANDROID_TAG: "20260317-angle-59" - DEBIAN_TEST_GL_TAG: "20260317-angle-59" + DEBIAN_TEST_ANDROID_TAG: "20260317-deqp" + DEBIAN_TEST_GL_TAG: "20260317-deqp" DEBIAN_TEST_VIDEO_TAG: "20250813-vector" DEBIAN_TEST_VK_TAG: "20260310-vkd3d" diff --git a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt index 8e005bcdf0b..e530f5c7ee4 100644 --- a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt +++ b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt @@ -26,7 +26,6 @@ dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_x,Fa dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_y,Fail KHR-GL43.cull_distance.functional,Fail -KHR-GL43.map_buffer_alignment.functional,Crash KHR-GL43.shader_image_load_store.basic-allTargets-store,Fail KHR-GL43.shader_image_load_store.incomplete_textures,Fail @@ -617,3 +616,26 @@ spec@arb_tessellation_shader@execution@built-in-functions@tcs-op-ne-vec4-vec4,Cr spec@arb_tessellation_shader@execution@variable-indexing@tcs-input-array-float-index-rd,Crash spec@arb_tessellation_shader@execution@variable-indexing@vs-output-array-vec2-index-wr-before-tcs,Crash spec@arb_tessellation_shader@execution@variable-indexing@vs-output-array-vec4-index-wr-before-tcs,Crash + +# New failures with GL CTS 4.6.8.0 +KHR-GL43.cull_distance.functional_test_item_5_primitive_mode_lines_max_culldist_0,Fail +KHR-GL43.framebuffer_blit.multisampled_to_singlesampled_blit_depth_config_test,Fail +KHR-GL43.gpu_shader_fp64.fp64.named_uniform_blocks,Crash +KHR-GL43.shading_language_420pack.implicit_conversions_case_t1_float_t2_int,Crash +KHR-GL43.shading_language_420pack.implicit_conversions_case_t1_vec4_t2_ivec4,Crash +KHR-GL43.shading_language_420pack.line_continuation_case_as_last_character_in_part_string_without_null_termination_repetition_multiple_ending_dos,Crash +KHR-GL43.shading_language_420pack.line_continuation_case_as_last_character_in_source_string_without_null_termination_repetition_multiple_ending_dos,Crash +KHR-GL43.shading_language_420pack.line_continuation_case_as_last_character_in_source_string_without_null_termination_repetition_single_ending_dos,Crash +KHR-GL43.shading_language_420pack.line_continuation_case_as_last_character_in_source_string_without_null_termination_repetition_single_ending_unix,Crash +KHR-GL43.shading_language_420pack.line_continuation_case_between_preprocessor_token_repetition_single_ending_unix,Crash +KHR-GL43.shading_language_420pack.line_continuation_case_inside_function_name_repetition_multiple_ending_unix,Crash +KHR-GL43.shading_language_420pack.line_continuation_case_inside_preprocessor_token_repetition_multiple_ending_dos,Crash +KHR-GL43.shading_language_420pack.line_continuation_case_inside_type_name_repetition_multiple_ending_unix,Crash +KHR-GL43.shading_language_420pack.line_continuation_case_inside_vector_variable_initializer_repetition_single_ending_dos,Crash +KHR-GL43.shading_language_420pack.line_continuation_case_just_after_assignment_operator_repetition_single_ending_dos,Crash +KHR-GL43.shading_language_420pack.line_continuation_case_just_before_last_character_in_part_of_source_repetition_multiple_ending_dos,Crash +KHR-GL43.shading_language_420pack.line_continuation_case_just_before_last_character_in_part_string_without_null_termination_repetition_multiple_ending_dos,Crash +KHR-GL43.shading_language_420pack.line_continuation_case_just_before_null_terminating_part_of_source_repetition_multiple_ending_dos,Crash +KHR-GL43.shading_language_420pack.line_continuation_case_just_before_null_terminating_part_of_source_repetition_multiple_ending_unix,Crash +KHR-GL43.shading_language_420pack.line_continuation_case_just_before_null_terminating_source_repetition_single_ending_dos,Crash +KHR-Single-GL43.arrays_of_arrays_gl.SubroutineArgumentAliasing2_var_type_index_14,Fail