diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index ea89e876666..447c7c8f012 100644 --- a/.gitlab-ci/container/build-crosvm.sh +++ b/.gitlab-ci/container/build-crosvm.sh @@ -12,9 +12,9 @@ pushd /platform/crosvm git checkout "$CROSVM_VERSION" git submodule update --init -VIRGLRENDERER_VERSION=f87cf939c17da7c681c904b87508074d247c03f2 +VIRGLRENDERER_VERSION=45bb2449b81336b88c267b1c1735f3b4946c7b3a rm -rf third_party/virglrenderer -git clone --single-branch -b master --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer +git clone --single-branch -b main --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer pushd third_party/virglrenderer git checkout "$VIRGLRENDERER_VERSION" meson setup build/ -D libdir=lib -D render-server-worker=process -D venus=true $EXTRA_MESON_ARGS diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 1daf31bea91..e5a46e6a6d7 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,6 +1,6 @@ variables: DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" - DEBIAN_BASE_TAG: "2023-06-21-virglrenderer" + DEBIAN_BASE_TAG: "2023-07-10-virglrenderer" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_BUILD_TAG: "2023-06-24-agility-711" @@ -21,7 +21,7 @@ variables: ALPINE_X86_64_BUILD_TAG: "2023-05-01-3.18-bump-1" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" FEDORA_X86_64_BUILD_TAG: "2023-05-05-ccache-on" - KERNEL_ROOTFS_TAG: "2023-07-05-angle" + KERNEL_ROOTFS_TAG: "2023-07-10-virglrenderer" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" diff --git a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt index 192c71315a1..1d60f383ce4 100644 --- a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt +++ b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt @@ -395,19 +395,7 @@ spec@arb_texture_compression_bptc@texwrap formats bordercolor-swizzled@GL_COMPRE spec@arb_texture_compression_bptc@texwrap formats bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM- swizzled- border color only,Fail spec@arb_texture_cube_map_array@fbo-generatemipmap-cubemap array s3tc_dxt1,Fail spec@arb_texture_float@fbo-blending-formats,Fail -spec@arb_texture_float@fbo-blending-formats@GL_ALPHA16F_ARB,Fail -spec@arb_texture_float@fbo-blending-formats@GL_ALPHA32F_ARB,Fail spec@arb_texture_float@fbo-blending-formats@GL_RGB32F,Fail -spec@arb_texture_float@fbo-clear-formats,Fail -spec@arb_texture_float@fbo-clear-formats@GL_ALPHA16F_ARB,Fail -spec@arb_texture_float@fbo-clear-formats@GL_ALPHA32F_ARB,Fail -spec@arb_texture_float@fbo-colormask-formats,Fail -spec@arb_texture_float@fbo-colormask-formats@GL_ALPHA16F_ARB,Fail -spec@arb_texture_float@fbo-colormask-formats@GL_ALPHA32F_ARB,Fail -spec@arb_texture_float@fbo-fast-clear,Fail -spec@arb_texture_float@multisample-fast-clear gl_arb_texture_float,Fail -spec@arb_texture_float@multisample-formats 2 gl_arb_texture_float,Fail -spec@arb_texture_float@multisample-formats 4 gl_arb_texture_float,Fail spec@arb_texture_float@texwrap formats bordercolor,Fail spec@arb_texture_float@texwrap formats bordercolor-swizzled,Fail spec@arb_texture_float@texwrap formats bordercolor-swizzled@GL_ALPHA16F_ARB- swizzled- border color only,Fail @@ -500,8 +488,6 @@ spec@ext_framebuffer_object@fbo-blending-formats@GL_INTENSITY8,Fail spec@ext_framebuffer_object@fbo-readpixels-depth-formats,Fail spec@ext_framebuffer_object@fbo-readpixels-depth-formats@GL_DEPTH_COMPONENT/GL_FLOAT,Fail spec@ext_framebuffer_object@fbo-readpixels-depth-formats@GL_DEPTH_COMPONENT24/GL_FLOAT,Fail -spec@ext_framebuffer_object@getteximage-formats init-by-clear-and-render,Fail -spec@ext_framebuffer_object@getteximage-formats init-by-rendering,Fail spec@ext_packed_depth_stencil@fbo-depthstencil-gl_depth24_stencil8-copypixels,Fail spec@ext_packed_depth_stencil@fbo-depthstencil-gl_depth24_stencil8-drawpixels-24_8,Fail spec@ext_packed_depth_stencil@fbo-depthstencil-gl_depth24_stencil8-drawpixels-32f_24_8_rev,Fail