From 7fa60cd7ce93ed0aedf26abb6b6ba4db0938b910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Fri, 3 Dec 2021 16:15:58 +0100 Subject: [PATCH] virgl: Disable cache for VIRGL_BIND_SAMPLER_VIEW MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this currently makes the dEQP-GLES31.functional.image_load_store.buffer.image_size.readonly_12 test fail when used simultaneously with other tests that lead to hitting the cache. For instance the combination of: dEQP-GLES31.functional.image_load_store.buffer.atomic.or_r32i_result dEQP-GLES31.functional.image_load_store.buffer.atomic.or_r32i_return_value dEQP-GLES31.functional.image_load_store.buffer.image_size.readonly_12 results in a failure of the readonly_12 test. Deflag dEQP-GLES31.functional.image_load_store.buffer.image_size.{read,write}only_12 as flakes. Signed-off-by: Corentin Noël Reviewed-by: Gert Wollny Part-of: --- src/gallium/drivers/virgl/ci/virgl-gl-flakes.txt | 3 --- src/gallium/drivers/virgl/ci/virgl-gles-flakes.txt | 3 --- src/gallium/winsys/virgl/drm/virgl_drm_winsys.c | 1 - 3 files changed, 7 deletions(-) diff --git a/src/gallium/drivers/virgl/ci/virgl-gl-flakes.txt b/src/gallium/drivers/virgl/ci/virgl-gl-flakes.txt index d5c22fa62cc..a40530cf5d9 100644 --- a/src/gallium/drivers/virgl/ci/virgl-gl-flakes.txt +++ b/src/gallium/drivers/virgl/ci/virgl-gl-flakes.txt @@ -5,9 +5,6 @@ KHR-GL30.shaders30.glsl_constructors.bvec4_from_mat4x3_vs # https://gitlab.freedesktop.org/mesa/mesa/-/issues/4651 KHR-GL31.transform_feedback.capture_special_interleaved_test -dEQP-GLES31.functional.image_load_store.buffer.image_size.writeonly_12 -dEQP-GLES31.functional.image_load_store.buffer.image_size.readonly_12 - dEQP-GLES2.functional.clipping.point.wide_point_clip dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_center dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner diff --git a/src/gallium/drivers/virgl/ci/virgl-gles-flakes.txt b/src/gallium/drivers/virgl/ci/virgl-gles-flakes.txt index d5c22fa62cc..a40530cf5d9 100644 --- a/src/gallium/drivers/virgl/ci/virgl-gles-flakes.txt +++ b/src/gallium/drivers/virgl/ci/virgl-gles-flakes.txt @@ -5,9 +5,6 @@ KHR-GL30.shaders30.glsl_constructors.bvec4_from_mat4x3_vs # https://gitlab.freedesktop.org/mesa/mesa/-/issues/4651 KHR-GL31.transform_feedback.capture_special_interleaved_test -dEQP-GLES31.functional.image_load_store.buffer.image_size.writeonly_12 -dEQP-GLES31.functional.image_load_store.buffer.image_size.readonly_12 - dEQP-GLES2.functional.clipping.point.wide_point_clip dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_center dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner diff --git a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c index 6bb14d7271d..d762542113a 100644 --- a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c +++ b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c @@ -67,7 +67,6 @@ static inline boolean can_cache_resource(uint32_t bind) bind == VIRGL_BIND_CUSTOM || bind == VIRGL_BIND_STAGING || bind == VIRGL_BIND_DEPTH_STENCIL || - bind == VIRGL_BIND_SAMPLER_VIEW || bind == VIRGL_BIND_RENDER_TARGET || bind == 0; }