diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2021-05-13 14:36:19 -0400 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-05-13 21:44:59 +0000 |
| commit | 719e4fb369af333b1d8bfd7eece83f7c72af35b3 (patch) | |
| tree | 4c01034b08947fb9f9254fefdb71a09e727047af | |
| parent | 8e2ac24482d87b10e2619c2de67ae0bfb33e98c4 (diff) | |
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 <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10788>
| -rw-r--r-- | src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 7 |
1 files changed, 6 insertions, 1 deletions
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); } |