From af76c23d74a678a1d8816b837a1b9e1e8b4a975f Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 9 May 2023 11:20:11 -0400 Subject: [PATCH] zink: use void return for store_dest not sure why this had returns, but it doesn't seem necessary Part-of: --- src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 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 5e4fea133e1..dc0342a93c7 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 @@ -1381,7 +1381,7 @@ store_dest_raw(struct ntv_context *ctx, nir_dest *dest, SpvId result) store_reg_def(ctx, &dest->reg, result); } -static SpvId +static void store_dest(struct ntv_context *ctx, nir_dest *dest, SpvId result, nir_alu_type type) { unsigned num_components = nir_dest_num_components(*dest); @@ -1415,7 +1415,6 @@ 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 @@ -1955,12 +1954,12 @@ get_alu_src(struct ntv_context *ctx, nir_alu_instr *alu, unsigned src, SpvId *ra } } -static SpvId +static void store_alu_result(struct ntv_context *ctx, nir_alu_instr *alu, SpvId result, bool force_float) { assert(!alu->dest.saturate); - return store_dest(ctx, &alu->dest.dest, result, - force_float ? nir_type_float : nir_op_infos[alu->op].output_type); + store_dest(ctx, &alu->dest.dest, result, + force_float ? nir_type_float : nir_op_infos[alu->op].output_type); } static SpvId