From 35baee5dce5eaa8785e0abc09c9a4d5f2aac97d4 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Wed, 31 Oct 2018 12:18:34 +0100 Subject: nir/constant_folding: fix incorrect bit-size check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit nir_alu_type_get_type_size takes a type as parameter and we were passing a bit-size instead, which did what we wanted by accident, since a bit-size of zero matches nir_type_invalid, which has a size of 0 too. Reviewed-by: Samuel Iglesias Gonsálvez --- src/compiler/nir/nir_opt_constant_folding.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/compiler') diff --git a/src/compiler/nir/nir_opt_constant_folding.c b/src/compiler/nir/nir_opt_constant_folding.c index 5929a60aee8..1fca530af24 100644 --- a/src/compiler/nir/nir_opt_constant_folding.c +++ b/src/compiler/nir/nir_opt_constant_folding.c @@ -63,10 +63,8 @@ constant_fold_alu_instr(nir_alu_instr *instr, void *mem_ctx) if (!instr->src[i].src.is_ssa) return false; - if (bit_size == 0 && - !nir_alu_type_get_type_size(nir_op_infos[instr->op].input_sizes[i])) { + if (bit_size == 0 && nir_op_infos[instr->op].input_sizes[i] == 0) bit_size = instr->src[i].src.ssa->bit_size; - } nir_instr *src_instr = instr->src[i].src.ssa->parent_instr; -- cgit v1.2.3