Mesa (master): zink: add SpvId returns to a couple ntv functions

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed May 20 09:41:22 2020 -0400

zink: add SpvId returns to a couple ntv functions

this is helpful for debugging

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

---

 src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 5 +++--
 1 file changed, 3 insertions(+), 2 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 4ba3d9db087..ccd5aa737bd 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
@@ -712,7 +712,7 @@ store_dest_raw(struct ntv_context *ctx, nir_dest *dest, SpvId result)
       store_reg_def(ctx, &dest->reg, result);
 }
 
-static void
+static SpvId
 store_dest(struct ntv_context *ctx, nir_dest *dest, SpvId result, nir_alu_type type)
 {
    unsigned num_components = nir_dest_num_components(*dest);
@@ -737,6 +737,7 @@ store_dest(struct ntv_context *ctx, nir_dest *dest, SpvId result, nir_alu_type t
    }
 
    store_dest_raw(ctx, dest, result);
+   return result;
 }
 
 static SpvId
@@ -889,7 +890,7 @@ get_alu_src(struct ntv_context *ctx, nir_alu_instr *alu, unsigned src)
    }
 }
 
-static void
+static SpvId
 store_alu_result(struct ntv_context *ctx, nir_alu_instr *alu, SpvId result)
 {
    assert(!alu->dest.saturate);