From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Fri, 26 Aug 2022 12:28:29 +0000 (+0200)
Subject: zink: emit terminate for spir-v 1.6
X-Git-Tag: upstream/23.3.3~10745
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=636bfc63585821629e2de5c13d688ef469c02d04;p=platform%2Fupstream%2Fmesa.git

zink: emit terminate for spir-v 1.6

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18274>
---

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 feb36c1..8eb76da 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
@@ -4688,7 +4688,13 @@ nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *sinfo, uint32_
                              type_void_func);
       SpvId label = spirv_builder_new_id(&ctx.builder);
       spirv_builder_label(&ctx.builder, label);
-      spirv_builder_emit_kill(&ctx.builder);
+
+      /* kill is deprecated in SPIR-V 1.6, use terminate instead */
+      if (spirv_version >= SPIRV_VERSION(1, 6))
+         spirv_builder_emit_terminate(&ctx.builder);
+      else
+         spirv_builder_emit_kill(&ctx.builder);
+
       spirv_builder_function_end(&ctx.builder);
    }