From 7c1a2cbcadf8d4a366df3f96818c19e082764c56 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 10 Feb 2020 15:26:41 +0100 Subject: [PATCH] zink/spirv: unit_value -> raw_value The point here isn't that the value is uint, but that is't untreated. So raw seems more fitting as a description. Part-of: --- src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 10 +++++----- 1 file changed, 5 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 d4fa359..8df35a3 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 @@ -864,7 +864,7 @@ alu_instr_src_components(const nir_alu_instr *instr, unsigned src) static SpvId get_alu_src(struct ntv_context *ctx, nir_alu_instr *alu, unsigned src) { - SpvId uint_value = get_alu_src_raw(ctx, alu, src); + SpvId raw_value = get_alu_src_raw(ctx, alu, src); unsigned num_components = alu_instr_src_components(alu, src); unsigned bit_size = nir_src_bit_size(alu->src[src].src); @@ -873,16 +873,16 @@ get_alu_src(struct ntv_context *ctx, nir_alu_instr *alu, unsigned src) switch (nir_alu_type_get_base_type(type)) { case nir_type_bool: assert(bit_size == 1); - return uvec_to_bvec(ctx, uint_value, num_components); + return uvec_to_bvec(ctx, raw_value, num_components); case nir_type_int: - return bitcast_to_ivec(ctx, uint_value, bit_size, num_components); + return bitcast_to_ivec(ctx, raw_value, bit_size, num_components); case nir_type_uint: - return uint_value; + return raw_value; case nir_type_float: - return bitcast_to_fvec(ctx, uint_value, bit_size, num_components); + return bitcast_to_fvec(ctx, raw_value, bit_size, num_components); default: unreachable("unknown nir_alu_type"); -- 2.7.4