From cf973fe2990a2dfe9c66cb427bbc37325dd1a39e Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 13 Mar 2023 15:29:31 -0400 Subject: [PATCH] zink: fix layer check for compressed format surface creation this is a universal check, not a check based on mutable state Fixes: 56108b411fd ("zink: verify compressed format layer count when creating surfaces") Part-of: --- src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt | 2 -- src/gallium/drivers/zink/zink_surface.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt index 34f37cd..be89092 100644 --- a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt @@ -598,8 +598,6 @@ spec@arb_tessellation_shader@execution@variable-indexing@tes-both-input-array-ve spec@arb_tessellation_shader@execution@variable-indexing@tes-both-input-array-vec3-index-rd,Crash spec@arb_tessellation_shader@execution@variable-indexing@tes-both-input-array-vec4-index-rd,Crash -spec@ext_texture_array@compressed texsubimage pbo,Crash - # "arb_texture_buffer_object-formats: ../src/gallium/drivers/zink/zink_context.c:807: create_bvci: Assertion `bvci.format' failed." spec@arb_texture_buffer_object@formats (vs- arb),Crash diff --git a/src/gallium/drivers/zink/zink_surface.c b/src/gallium/drivers/zink/zink_surface.c index 5b44e9c..38eb77b 100644 --- a/src/gallium/drivers/zink/zink_surface.c +++ b/src/gallium/drivers/zink/zink_surface.c @@ -283,7 +283,7 @@ zink_create_surface(struct pipe_context *pctx, format is a non-compressed format, the levelCount and layerCount members of subresourceRange must both be 1 */ - if (needs_mutable && util_format_is_compressed(pres->format) && templ->u.tex.first_layer != templ->u.tex.last_layer) + if (util_format_is_compressed(pres->format) && templ->u.tex.first_layer != templ->u.tex.last_layer) return NULL; } -- 2.7.4