From 2283ac58327d2a1590de51f4e5d17de314e1b3f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Tue, 28 Jun 2022 17:57:33 +0200 Subject: [PATCH] virgl/ci: Update virglrenderer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update virglrenderer to the latest version on time. Signed-off-by: Corentin Noël Part-of: --- .gitlab-ci/container/build-crosvm.sh | 2 +- .gitlab-ci/image-tags.yml | 4 +-- src/gallium/drivers/virgl/ci/traces-virgl.yml | 2 +- .../drivers/virgl/ci/virpipe-gl-fails.txt | 26 ------------------- 4 files changed, 4 insertions(+), 30 deletions(-) diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index 878b3a0d834..92f181eb688 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=1c311dc0eb4a6477ebf695ff430021adabddd518 +VIRGLRENDERER_VERSION=dd301caf7e05ec9c09634fb7872067542aad89b7 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 5aa9dfa3367..39ae41b108c 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -11,11 +11,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-07-03-cts" + DEBIAN_X86_TEST_GL_TAG: "2022-07-06-virgl-update" DEBIAN_X86_TEST_VK_TAG: "2022-07-03-cts" FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5" - KERNEL_ROOTFS_TAG: "2022-07-03-cts" + KERNEL_ROOTFS_TAG: "2022-07-06-virgl-update" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-06-15-vs-winsdk" diff --git a/src/gallium/drivers/virgl/ci/traces-virgl.yml b/src/gallium/drivers/virgl/ci/traces-virgl.yml index a015fd5fccc..26647eb337c 100644 --- a/src/gallium/drivers/virgl/ci/traces-virgl.yml +++ b/src/gallium/drivers/virgl/ci/traces-virgl.yml @@ -17,7 +17,7 @@ traces: - path: gputest/furmark-v2.trace expectations: - device: gl-virgl - checksum: 57ddd36b117adc9216c65c10d914a37e + checksum: 2762c809316c58d4eefad6677ecfcb2e - path: gputest/pixmark-piano-v2.trace expectations: - device: gl-virgl diff --git a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt index 6023cfee386..76d71cad565 100644 --- a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt +++ b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt @@ -50,24 +50,6 @@ KHR-GL43.shader_image_load_store.basic-allFormats-loadGeometryStages,Fail KHR-GL43.shader_image_load_store.basic-allFormats-storeGeometryStages,Fail KHR-GL43.shader_image_load_store.basic-allTargets-store,Fail KHR-GL43.shader_image_load_store.incomplete_textures,Fail -KHR-GL43.shader_image_size.advanced-nonMS-cs-float,Fail -KHR-GL43.shader_image_size.advanced-nonMS-cs-int,Fail -KHR-GL43.shader_image_size.advanced-nonMS-cs-uint,Fail -KHR-GL43.shader_image_size.advanced-nonMS-fs-float,Fail -KHR-GL43.shader_image_size.advanced-nonMS-fs-int,Fail -KHR-GL43.shader_image_size.advanced-nonMS-fs-uint,Fail -KHR-GL43.shader_image_size.advanced-nonMS-gs-float,Fail -KHR-GL43.shader_image_size.advanced-nonMS-gs-int,Fail -KHR-GL43.shader_image_size.advanced-nonMS-gs-uint,Fail -KHR-GL43.shader_image_size.advanced-nonMS-tcs-float,Fail -KHR-GL43.shader_image_size.advanced-nonMS-tcs-int,Fail -KHR-GL43.shader_image_size.advanced-nonMS-tcs-uint,Fail -KHR-GL43.shader_image_size.advanced-nonMS-tes-float,Fail -KHR-GL43.shader_image_size.advanced-nonMS-tes-int,Fail -KHR-GL43.shader_image_size.advanced-nonMS-tes-uint,Fail -KHR-GL43.shader_image_size.advanced-nonMS-vs-float,Fail -KHR-GL43.shader_image_size.advanced-nonMS-vs-int,Fail -KHR-GL43.shader_image_size.advanced-nonMS-vs-uint,Fail KHR-GL43.shader_storage_buffer_object.advanced-indirectAddressing-case2,Fail KHR-GL43.shader_storage_buffer_object.advanced-usage-case1,Fail KHR-GL43.shader_storage_buffer_object.advanced-usage-sync,Fail @@ -375,8 +357,6 @@ spec@arb_get_texture_sub_image@arb_get_texture_sub_image-get,Fail # segfault spec@arb_get_texture_sub_image@arb_get_texture_sub_image-getcompressed,Crash -spec@arb_gpu_shader5@execution@precise@fs-fract-of-nan,Fail - spec@arb_gpu_shader_fp64@execution@conversion@frag-conversion-explicit-dmat2-mat2,Fail spec@arb_gpu_shader_fp64@execution@conversion@frag-conversion-explicit-dmat2x3-mat2x3,Fail spec@arb_gpu_shader_fp64@execution@conversion@frag-conversion-explicit-dmat2x4-mat2x4,Fail @@ -869,8 +849,6 @@ spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-08,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-clamp-z,Fail spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail -spec@glsl-1.30@execution@vs-isnan-and-more-comparison,Fail - spec@glsl-1.50@execution@primitive-id-no-gs-quad-strip,Fail spec@glsl-1.50@execution@primitive-id-no-gs-quads,Fail @@ -984,7 +962,3 @@ spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3@oes_egl_image_ext spec@oes_shader_io_blocks@compiler@layout-location-aliasing.vert,Fail spec@!opengl 1.0@depth-clear-precision-check,Fail spec@!opengl 1.0@depth-clear-precision-check@depth32,Fail -spec@arb_texture_buffer_object@texture-buffer-size-clamp,Crash -spec@arb_texture_buffer_object@texture-buffer-size-clamp@r8ui_texture_buffer_size_via_image,Fail -spec@arb_texture_buffer_object@texture-buffer-size-clamp@r8ui_texture_buffer_size_via_sampler,Fail -spec@arb_texture_buffer_object@texture-buffer-size-clamp@rg8ui_texture_buffer_size_via_sampler,Fail