From 47d67912bdf27aa11bcd097142d98016a4ca9874 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Thu, 25 Aug 2022 09:42:43 +0200 Subject: [PATCH] zink: add spirv_builder_function_call It can be useful not just to create functions, but also being able to call them. This adds the spirv_builder-helper for this. Cc: mesa-stable Reviewed-by: Mike Blumenkrantz Reviewed-by: Jason Ekstrand Part-of: --- .../drivers/zink/nir_to_spirv/spirv_builder.c | 22 ++++++++++++++++++++++ .../drivers/zink/nir_to_spirv/spirv_builder.h | 5 +++++ 2 files changed, 27 insertions(+) diff --git a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c index b1573e5..88eb233 100644 --- a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c +++ b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c @@ -404,6 +404,28 @@ spirv_builder_function_end(struct spirv_builder *b) spirv_buffer_emit_word(&b->instructions, SpvOpFunctionEnd | (1 << 16)); } +SpvId +spirv_builder_function_call(struct spirv_builder *b, SpvId result_type, + SpvId function, const SpvId arguments[], + size_t num_arguments) +{ + SpvId result = spirv_builder_new_id(b); + + int words = 4 + num_arguments; + spirv_buffer_prepare(&b->instructions, b->mem_ctx, words); + spirv_buffer_emit_word(&b->instructions, + SpvOpFunctionCall | (words << 16)); + spirv_buffer_emit_word(&b->instructions, result_type); + spirv_buffer_emit_word(&b->instructions, result); + spirv_buffer_emit_word(&b->instructions, function); + + for (int i = 0; i < num_arguments; ++i) + spirv_buffer_emit_word(&b->instructions, arguments[i]); + + return result; +} + + void spirv_builder_label(struct spirv_builder *b, SpvId label) { diff --git a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.h b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.h index 01833ce..2d5887e 100644 --- a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.h +++ b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.h @@ -414,6 +414,11 @@ spirv_builder_type_function(struct spirv_builder *b, SpvId return_type, size_t num_parameter_types); SpvId +spirv_builder_function_call(struct spirv_builder *b, SpvId result_type, + SpvId function, const SpvId arguments[], + size_t num_arguments); + +SpvId spirv_builder_const_bool(struct spirv_builder *b, bool val); SpvId -- 2.7.4