From b7e39657f67d9cfb932876012da1a8d05d4c18bd Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 8 Feb 2024 15:21:39 -0500 Subject: [PATCH] zink: only add arrays to indirect non-tcs variables these are already sized accurately Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt | 3 --- src/gallium/drivers/zink/ci/zink-radv-navi31-fails.txt | 3 --- src/gallium/drivers/zink/ci/zink-radv-polaris10-fails.txt | 3 --- src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt | 3 --- src/gallium/drivers/zink/zink_compiler.c | 2 +- 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt index 353bb7c8069..5ac98e90267 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt @@ -338,6 +338,3 @@ spec@arb_viewport_array@display-list,Fail # New CTS failures in 1.3.6.3 dEQP-GLES31.functional.image_load_store.buffer.atomic.comp_swap_r32i_return_value,Fail -# uprev Piglit in Mesa -spec@arb_tessellation_shader@execution@tesslevels-indirect,Crash - diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi31-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-navi31-fails.txt index 25ae45ed7e5..a826438ae27 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-navi31-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-navi31-fails.txt @@ -370,6 +370,3 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuv420,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvu420,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvyu,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88,Fail - -# Introduced by a piglit uprev: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25449 -spec@arb_tessellation_shader@execution@tesslevels-indirect,Crash diff --git a/src/gallium/drivers/zink/ci/zink-radv-polaris10-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-polaris10-fails.txt index 101d5bacf18..1c4088c67f2 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-polaris10-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-polaris10-fails.txt @@ -817,6 +817,3 @@ spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SR spec@glsl-1.50@execution@geometry@primitive-types gl_triangle_strip_adjacency,Fail spec@glsl-1.50@execution@geometry@tri-strip-ordering-with-prim-restart gl_triangle_strip_adjacency ffs,Fail spec@glsl-1.50@execution@geometry@tri-strip-ordering-with-prim-restart gl_triangle_strip_adjacency other,Fail - -# Introduced by a piglit uprev: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25449 -spec@arb_tessellation_shader@execution@tesslevels-indirect,Crash diff --git a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt index d293367a226..6b8730bc7dd 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt @@ -339,6 +339,3 @@ spec@!opengl 1.0@gl-1.0-polygon-line-aa,Fail # Regression noticed in https://gitlab.freedesktop.org/mesa/mesa/-/pipelines/891104 spec@arb_viewport_array@display-list,Fail -# uprev Piglit in Mesa -spec@arb_tessellation_shader@execution@tesslevels-indirect,Crash - diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 0c8efd4746e..212787809a6 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -5199,7 +5199,7 @@ rework_io_vars(nir_shader *nir, nir_variable_mode mode) } /* reset the mode for nir_is_arrayed_io to work */ bool is_arrayed = io_instr_is_arrayed(intr); - if (is_indirect) { + if (is_indirect && s.location != VARYING_SLOT_TESS_LEVEL_INNER && s.location != VARYING_SLOT_TESS_LEVEL_OUTER) { /* indirect array access requires the full array in a single variable */ unsigned slot_count = s.num_slots; if (bit_size == 64 && slot_count > 1)