From 719e4fb369af333b1d8bfd7eece83f7c72af35b3 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 13 May 2021 14:36:19 -0400 Subject: [PATCH] zink: fix DrawParameters shader cap usage this is for vertex shaders and covers more than just baseinstance Fixes: dcb9e4ddb4b ("zink: emit cap early") Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c index b180b259d3c..da55ec8a067 100644 --- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c +++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c @@ -3576,7 +3576,12 @@ nir_to_spirv(struct nir_shader *s, const struct zink_so_info *so_info, bool spir spirv_builder_emit_cap(&ctx.builder, SpvCapabilitySampleMaskPostDepthCoverage); if (s->info.fs.uses_sample_shading) spirv_builder_emit_cap(&ctx.builder, SpvCapabilitySampleRateShading); - if (BITSET_TEST(s->info.system_values_read, SYSTEM_VALUE_INSTANCE_ID)) { + break; + + case MESA_SHADER_VERTEX: + if (BITSET_TEST(s->info.system_values_read, SYSTEM_VALUE_INSTANCE_ID) || + BITSET_TEST(s->info.system_values_read, SYSTEM_VALUE_BASE_INSTANCE) || + BITSET_TEST(s->info.system_values_read, SYSTEM_VALUE_BASE_VERTEX)) { spirv_builder_emit_extension(&ctx.builder, "SPV_KHR_shader_draw_parameters"); spirv_builder_emit_cap(&ctx.builder, SpvCapabilityDrawParameters); }