Mesa (main): zink: more accurately handle shader layer/viewport caps

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 7b13c1461d7bb1a976f56717bf5b26b9dc82642b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7b13c1461d7bb1a976f56717bf5b26b9dc82642b

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Tue Jun  8 11:23:43 2021 -0400

zink: more accurately handle shader layer/viewport caps

the spirv extension is required for spirv < 1.5, but the core cap should
be used for spirv >= 1.5

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11244>

---

 src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 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 aa115f434cb..7e906ce3253 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
@@ -3611,9 +3611,12 @@ nir_to_spirv(struct nir_shader *s, const struct zink_so_info *so_info, uint32_t
    if (s->info.stage < MESA_SHADER_GEOMETRY) {
       if (s->info.outputs_written & BITFIELD64_BIT(VARYING_SLOT_LAYER) ||
           s->info.inputs_read & BITFIELD64_BIT(VARYING_SLOT_LAYER)) {
-         spirv_builder_emit_extension(&ctx.builder, "SPV_EXT_shader_viewport_index_layer");
-         spirv_builder_emit_cap(&ctx.builder, SpvCapabilityShaderViewportIndexLayerEXT);
-         spirv_builder_emit_cap(&ctx.builder, SpvCapabilityShaderLayer);
+         if (spirv_version >= SPIRV_VERSION(1, 5))
+            spirv_builder_emit_cap(&ctx.builder, SpvCapabilityShaderLayer);
+         else {
+            spirv_builder_emit_extension(&ctx.builder, "SPV_EXT_shader_viewport_index_layer");
+            spirv_builder_emit_cap(&ctx.builder, SpvCapabilityShaderViewportIndexLayerEXT);
+         }
       }
    }