Module: Mesa Branch: main Commit: 0a0205f04552ab21971c431a5f8bb7486d664422 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0a0205f04552ab21971c431a5f8bb7486d664422
Author: Corentin Noël <[email protected]> Date: Tue Aug 2 12:53:07 2022 +0200 virgl/ci: Update virglrenderer Update virglrenderer to the latest version on time. Signed-off-by: Corentin Noël <[email protected]> Reviewed-by: Gert Wollny <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17853> --- .gitlab-ci/container/build-crosvm.sh | 2 +- .gitlab-ci/image-tags.yml | 4 ++-- src/gallium/drivers/virgl/ci/deqp-virgl-gl.toml | 2 +- src/gallium/drivers/virgl/ci/deqp-virgl-gles.toml | 2 +- src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt | 10 ---------- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index 1004ea11d14..e69f137ba6b 100644 --- a/.gitlab-ci/container/build-crosvm.sh +++ b/.gitlab-ci/container/build-crosvm.sh @@ -15,7 +15,7 @@ git submodule update --init # Apply all crosvm patches for Mesa CI git am "$SCRIPT_DIR"/.gitlab-ci/container/build-crosvm_*.patch -VIRGLRENDERER_VERSION=dd301caf7e05ec9c09634fb7872067542aad89b7 +VIRGLRENDERER_VERSION=dd19a0f352c06a8c9d6859d026438f7327dec3ec 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 5261341ffde..23002c475cf 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,6 +1,6 @@ variables: DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" - DEBIAN_BASE_TAG: "2022-08-04-venus-ci" + DEBIAN_BASE_TAG: "2022-08-04-virgl-update" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_BUILD_TAG: "2022-07-14-directx-headers" @@ -15,7 +15,7 @@ variables: DEBIAN_X86_TEST_VK_TAG: "2022-08-04-crosvm-opaque-fd" FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5" - KERNEL_ROOTFS_TAG: "2022-07-06-virgl-update" + KERNEL_ROOTFS_TAG: "2022-08-04-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/deqp-virgl-gl.toml b/src/gallium/drivers/virgl/ci/deqp-virgl-gl.toml index fc874c49fb9..10daea0d738 100644 --- a/src/gallium/drivers/virgl/ci/deqp-virgl-gl.toml +++ b/src/gallium/drivers/virgl/ci/deqp-virgl-gl.toml @@ -11,7 +11,7 @@ deqp_args = [ ] timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time version_check = "GL ES 3.2.*git" -renderer_check = "virgl.*llvmpipe" +renderer_check = "virgl.*LLVMPIPE" [[deqp]] deqp = "/install/crosvm-runner.sh" diff --git a/src/gallium/drivers/virgl/ci/deqp-virgl-gles.toml b/src/gallium/drivers/virgl/ci/deqp-virgl-gles.toml index fc874c49fb9..10daea0d738 100644 --- a/src/gallium/drivers/virgl/ci/deqp-virgl-gles.toml +++ b/src/gallium/drivers/virgl/ci/deqp-virgl-gles.toml @@ -11,7 +11,7 @@ deqp_args = [ ] timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time version_check = "GL ES 3.2.*git" -renderer_check = "virgl.*llvmpipe" +renderer_check = "virgl.*LLVMPIPE" [[deqp]] deqp = "/install/crosvm-runner.sh" diff --git a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt index cfec873e490..adbbbd16671 100644 --- a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt +++ b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt @@ -63,7 +63,6 @@ KHR-GL43.shader_subroutine.ssbo_atomic_image_load_store,Fail KHR-GL43.shading_language_420pack.binding_image_array,Fail KHR-GL43.shading_language_420pack.binding_images,Fail -KHR-GL43.shading_language_420pack.length_of_vector_and_matrix,Fail KHR-GL43.texture_view.view_sampling,Fail KHR-GL43.transform_feedback_overflow_query_ARB.advanced-single-stream-interleaved-attribs,Fail KHR-GL43.transform_feedback_overflow_query_ARB.advanced-single-stream-separate-attribs,Fail @@ -508,20 +507,11 @@ spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube,Fail spec@arb_shader_texture_lod@execution@glsl-fs-shadow2dgradarb-07,Fail spec@arb_shader_texture_lod@execution@glsl-fs-shadow2dgradarb-08,Fail spec@arb_shader_texture_lod@execution@glsl-fs-shadow2dgradarb-cumulative,Fail -spec@arb_tessellation_shader@execution@barrier-patch,Fail spec@arb_tessellation_shader@execution@double-array-vs-tcs-tes,Fail spec@arb_tessellation_shader@execution@double-vs-tcs-tes,Fail spec@arb_tessellation_shader@execution@dvec2-vs-tcs-tes,Fail spec@arb_tessellation_shader@execution@dvec3-vs-tcs-tes,Fail spec@arb_tessellation_shader@execution@gs-primitiveid-instanced,Fail -spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-float-index-rd-after-barrier,Fail -spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-float-index-wr-before-barrier,Fail -spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-vec2-index-rd-after-barrier,Fail -spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-vec2-index-wr-before-barrier,Fail -spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-vec3-index-rd-after-barrier,Fail -spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-vec3-index-wr-before-barrier,Fail -spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-vec4-index-rd-after-barrier,Fail -spec@arb_tessellation_shader@execution@variable-indexing@tcs-output-array-vec4-index-wr-before-barrier,Fail # " intrinsic copy_deref (ssa_2, ssa_3) (dst_access=0, src_access=0) # error: glsl_get_bare_type(dst->type) == glsl_get_bare_type(src->type) (../src/compiler/nir/nir_validate.c:643)"
