Mesa (main): zink: store the tcs_vertices_out spirv word

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Feb  9 15:41:02 2022 -0500

zink: store the tcs_vertices_out spirv word

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14976>

---

 src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 7 ++++---
 1 file changed, 4 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 c9a85b97134..774484fabd2 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
@@ -3851,6 +3851,7 @@ nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *sinfo, uint32_
 
    if (sinfo->last_vertex)
       emit_so_info(&ctx, sinfo, max_output + 1);
+   uint32_t tcs_vertices_out_word = 0;
 
    /* we have to reverse iterate to match what's done in zink_compiler.c */
    foreach_list_typed_reverse(nir_variable, var, node, &s->variables)
@@ -3896,9 +3897,9 @@ nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *sinfo, uint32_
          spirv_builder_emit_exec_mode(&ctx.builder, entry_point, SpvExecutionModeSampleInterlockUnorderedEXT);
       break;
    case MESA_SHADER_TESS_CTRL:
-      spirv_builder_emit_exec_mode_literal(&ctx.builder, entry_point,
-                                           SpvExecutionModeOutputVertices,
-                                           s->info.tess.tcs_vertices_out);
+      tcs_vertices_out_word = spirv_builder_emit_exec_mode_literal(&ctx.builder, entry_point,
+                                                                   SpvExecutionModeOutputVertices,
+                                                                   s->info.tess.tcs_vertices_out);
       break;
    case MESA_SHADER_TESS_EVAL:
       spirv_builder_emit_exec_mode(&ctx.builder, entry_point,