From 1994f1404ed13e5854696fa00bcf437d4e413738 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Fri, 18 Mar 2022 09:04:47 +0100 Subject: [PATCH] virgl: re-enable PIPE_CAP_TGSI_TEXCOORD with new host versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also upreaf the virglrenderer version used in the CI. v2: Update checksums of trace result images (0 pixels were different) Signed-off-by: Gert Wollny Reviewed-by: Corentin Noël (v1) Part-of: --- .gitlab-ci/container/build-crosvm.sh | 2 +- .gitlab-ci/image-tags.yml | 2 +- src/gallium/drivers/virgl/virgl_screen.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index b690bcebb5a..9b8088344f0 100644 --- a/.gitlab-ci/container/build-crosvm.sh +++ b/.gitlab-ci/container/build-crosvm.sh @@ -8,7 +8,7 @@ pushd /platform/crosvm git checkout "$CROSVM_VERSION" git submodule update --init -VIRGLRENDERER_VERSION=c0871ad3195c7c36e970daa30406b9633f13cd91 +VIRGLRENDERER_VERSION=45070fae92d25a726d9ce10fc22c1f92270ecd35 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 216bcbccdec..aaff4e6af44 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -8,7 +8,7 @@ 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-03-03-nouveau" + DEBIAN_X86_TEST_GL_TAG: "2022-03-25-virglrenderer" DEBIAN_X86_TEST_VK_TAG: "2022-02-21-libdrm" FEDORA_X86_BUILD_TAG: "2022-03-18-spirv-tools-5" diff --git a/src/gallium/drivers/virgl/virgl_screen.c b/src/gallium/drivers/virgl/virgl_screen.c index 0c17a10118f..0f0a60fa0e1 100644 --- a/src/gallium/drivers/virgl/virgl_screen.c +++ b/src/gallium/drivers/virgl/virgl_screen.c @@ -200,7 +200,7 @@ virgl_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_QUERY_TIME_ELAPSED: return 1; case PIPE_CAP_TGSI_TEXCOORD: - return 0; + return vscreen->caps.caps.v2.host_feature_check_version >= 10; case PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT: return VIRGL_MAP_BUFFER_ALIGNMENT; case PIPE_CAP_TEXTURE_BUFFER_OBJECTS: