OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: emit terminate for spir-v 1.6

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18274>
This commit is contained in:
Erik Faye-Lund
2022-08-26 14:28:29 +02:00
committed by Marge Bot
parent 67462ed014
commit 636bfc6358
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
View File

@@ -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);
}