Mesa (master): zink: add some spirv_builder functions we'll be using for geometry shaders

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 182f7f9ae8e492355d6e98bc88d52a761b2b2996
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=182f7f9ae8e492355d6e98bc88d52a761b2b2996

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Oct 14 10:27:56 2020 -0400

zink: add some spirv_builder functions we'll be using for geometry shaders

Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7139>

---

 .../drivers/zink/nir_to_spirv/spirv_builder.c      | 25 ++++++++++++++++++++++
 .../drivers/zink/nir_to_spirv/spirv_builder.h      |  8 ++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

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 3a522c4bb77..cc361a0916a 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c
@@ -145,6 +145,17 @@ spirv_builder_emit_entry_point(struct spirv_builder *b,
         spirv_buffer_emit_word(&b->entry_points, interfaces[i]);
 }
 
+void
+spirv_builder_emit_exec_mode_literal(struct spirv_builder *b, SpvId entry_point,
+                                     SpvExecutionMode exec_mode, uint32_t param)
+{
+   spirv_buffer_prepare(&b->exec_modes, b->mem_ctx, 4);
+   spirv_buffer_emit_word(&b->exec_modes, SpvOpExecutionMode | (4 << 16));
+   spirv_buffer_emit_word(&b->exec_modes, entry_point);
+   spirv_buffer_emit_word(&b->exec_modes, exec_mode);
+   spirv_buffer_emit_word(&b->exec_modes, param);
+}
+
 void
 spirv_builder_emit_exec_mode(struct spirv_builder *b, SpvId entry_point,
                              SpvExecutionMode exec_mode)
@@ -212,6 +223,20 @@ spirv_builder_emit_builtin(struct spirv_builder *b, SpvId target,
    emit_decoration(b, target, SpvDecorationBuiltIn, args, ARRAY_SIZE(args));
 }
 
+void
+spirv_builder_emit_vertex(struct spirv_builder *b)
+{
+   spirv_buffer_prepare(&b->instructions, b->mem_ctx, 1);
+   spirv_buffer_emit_word(&b->instructions, SpvOpEmitVertex | (1 << 16));
+}
+
+void
+spirv_builder_end_primitive(struct spirv_builder *b)
+{
+   spirv_buffer_prepare(&b->instructions, b->mem_ctx, 1);
+   spirv_buffer_emit_word(&b->instructions, SpvOpEndPrimitive | (1 << 16));
+}
+
 void
 spirv_builder_emit_descriptor_set(struct spirv_builder *b, SpvId target,
                                   uint32_t descriptor_set)
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 487d4f79fda..99128919e37 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.h
+++ b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.h
@@ -135,7 +135,9 @@ spirv_builder_emit_entry_point(struct spirv_builder *b,
                                SpvExecutionModel exec_model, SpvId entry_point,
                                const char *name, const SpvId interfaces[],
                                size_t num_interfaces);
-
+void
+spirv_builder_emit_exec_mode_literal(struct spirv_builder *b, SpvId entry_point,
+                                     SpvExecutionMode exec_mode, uint32_t param);
 void
 spirv_builder_emit_exec_mode(struct spirv_builder *b, SpvId entry_point,
                              SpvExecutionMode exec_mode);
@@ -349,4 +351,8 @@ size_t
 spirv_builder_get_words(struct spirv_builder *b, uint32_t *words,
                         size_t num_words);
 
+void
+spirv_builder_emit_vertex(struct spirv_builder *b);
+void
+spirv_builder_end_primitive(struct spirv_builder *b);
 #endif