From 583a4210e5aaf4c3eeaca4f5f6aa9758407dbf50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Fri, 20 May 2022 10:24:08 +0200 Subject: [PATCH] virgl/ci: Update virglrenderer Update virglrenderer to the latest version on time. Part-of: --- .gitlab-ci/container/build-crosvm.sh | 2 +- .gitlab-ci/image-tags.yml | 4 ++-- src/gallium/drivers/virgl/ci/virgl-gl-fails.txt | 3 --- src/gallium/drivers/virgl/ci/virgl-gles-fails.txt | 5 ----- src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt | 4 ---- 5 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index 05172fa45a7..878b3a0d834 100644 --- a/.gitlab-ci/container/build-crosvm.sh +++ b/.gitlab-ci/container/build-crosvm.sh @@ -13,7 +13,7 @@ git submodule update --init cat "$SCRIPT_DIR"/.gitlab-ci/container/build-crosvm_*.patch | patch -p1 -VIRGLRENDERER_VERSION=0564c9a0c2f584e004a7d4864aee3b8ec9692105 +VIRGLRENDERER_VERSION=1c311dc0eb4a6477ebf695ff430021adabddd518 rm -rf third_party/virglrenderer git clone --single-branch -b master --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer pushd third_party/virglrenderer diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 7f805f1038b..1497c73091e 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -8,11 +8,11 @@ variables: DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl" - DEBIAN_X86_TEST_GL_TAG: "2022-05-10-piglit-up" + DEBIAN_X86_TEST_GL_TAG: "2022-05-20-virgl-update" DEBIAN_X86_TEST_VK_TAG: "2022-05-10-piglit-up" FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5" - KERNEL_ROOTFS_TAG: "2022-05-10-piglit-up" + KERNEL_ROOTFS_TAG: "2022-05-20-virgl-update" WINDOWS_X64_BUILD_PATH: "windows/x64_build" WINDOWS_X64_BUILD_TAG: "2022-20-02-base_split" diff --git a/src/gallium/drivers/virgl/ci/virgl-gl-fails.txt b/src/gallium/drivers/virgl/ci/virgl-gl-fails.txt index 0514b6d0a05..7e9ba6fa4b2 100644 --- a/src/gallium/drivers/virgl/ci/virgl-gl-fails.txt +++ b/src/gallium/drivers/virgl/ci/virgl-gl-fails.txt @@ -16,9 +16,6 @@ dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_dst_x,Fail dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_x,Fail dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_y,Fail dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_x,Fail -dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.4,Fail -dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.8,Fail -dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.9,Fail dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_equal,Fail dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_larger,Fail dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.fbo_bbox_equal,Fail diff --git a/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt b/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt index 6642ef7b7de..e376aae3f48 100644 --- a/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt +++ b/src/gallium/drivers/virgl/ci/virgl-gles-fails.txt @@ -16,9 +16,6 @@ dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_dst_x,Fail dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_x,Fail dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_y,Fail dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_x,Fail -dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.4,Fail -dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.8,Fail -dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.9,Fail dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_equal,Fail dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_larger,Fail dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.fbo_bbox_equal,Fail @@ -43,11 +40,9 @@ KHR-GL30.glsl_noperspective.functionaltest,Fail KHR-GL30.transform_feedback.api_errors_test,Fail KHR-GL30.transform_feedback.draw_xfb_stream_instanced_test,Fail -KHR-GL31.CommonBugs.CommonBug_ParenthesisInLayoutQualifierIntegerValue,Fail KHR-GL31.transform_feedback.capture_special_interleaved_test,Crash KHR-GL31.transform_feedback.draw_xfb_stream_instanced_test,Fail KHR-GL31.glsl_noperspective.functionaltest,Fail -KHR-GL32.CommonBugs.CommonBug_ParenthesisInLayoutQualifierIntegerValue,Fail KHR-GL32.transform_feedback.draw_xfb_stream_instanced_test,Fail KHR-GL32.transform_feedback_overflow_query_ARB.advanced-single-stream-interleaved-attribs,Fail KHR-GL32.transform_feedback_overflow_query_ARB.advanced-single-stream-separate-attribs,Fail diff --git a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt index 77138b5d121..27c82e14e1b 100644 --- a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt +++ b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt @@ -3,8 +3,6 @@ dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_corner,Fail dEQP-GLES2.functional.clipping.point.wide_point_clip,Fail dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_center,Fail dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner,Fail -dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.4,Fail -dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.9,Fail dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_equal,Fail dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.default_framebuffer_bbox_larger,Fail dEQP-GLES31.functional.primitive_bounding_box.wide_points.global_state.vertex_tessellation_fragment.fbo_bbox_equal,Fail @@ -728,8 +726,6 @@ spec@ext_framebuffer_multisample@no-color 4 depth single,Fail spec@ext_framebuffer_multisample@no-color 4 depth-computed single,Fail spec@ext_framebuffer_multisample@sample-coverage 2 inverted,Fail spec@ext_framebuffer_multisample@sample-coverage 2 non-inverted,Fail -spec@ext_framebuffer_object@fbo-alphatest-nocolor,Fail -spec@ext_framebuffer_object@fbo-alphatest-nocolor-ff,Fail spec@ext_framebuffer_object@fbo-blending-format-quirks,Fail spec@ext_framebuffer_object@fbo-blending-formats,Fail spec@ext_framebuffer_object@fbo-blending-formats@GL_INTENSITY,Fail