From b047016e70dfdbd2ce3b6b268ce1c9f00c0c95f8 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 1 Aug 2023 12:27:09 -0400 Subject: [PATCH] lima: Collapse is_ssa checks Signed-off-by: Alyssa Rosenzweig Reviewed-by: Faith Ekstrand Part-of: --- src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c | 14 ++++---------- src/gallium/drivers/lima/ir/lima_nir_lower_txp.c | 8 -------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c b/src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c index 90b02bf..bca1043 100644 --- a/src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c +++ b/src/gallium/drivers/lima/ir/lima_nir_duplicate_intrinsic.c @@ -41,11 +41,8 @@ lima_nir_duplicate_intrinsic(nir_builder *b, nir_intrinsic_instr *itr, dupl = nir_intrinsic_instr_create(b->shader, op); dupl->num_components = itr->num_components; memcpy(dupl->const_index, itr->const_index, sizeof(itr->const_index)); - dupl->src[0].is_ssa = itr->src[0].is_ssa; - if (itr->src[0].is_ssa) - dupl->src[0].ssa = itr->src[0].ssa; - else - dupl->src[0].reg = itr->src[0].reg; + dupl->src[0].is_ssa = true; + dupl->src[0].ssa = itr->src[0].ssa; nir_ssa_dest_init(&dupl->instr, &dupl->dest, dupl->num_components, itr->dest.ssa.bit_size); @@ -74,11 +71,8 @@ lima_nir_duplicate_intrinsic(nir_builder *b, nir_intrinsic_instr *itr, dupl = nir_intrinsic_instr_create(b->shader, op); dupl->num_components = itr->num_components; memcpy(dupl->const_index, itr->const_index, sizeof(itr->const_index)); - dupl->src[0].is_ssa = itr->src[0].is_ssa; - if (itr->src[0].is_ssa) - dupl->src[0].ssa = itr->src[0].ssa; - else - dupl->src[0].reg = itr->src[0].reg; + dupl->src[0].is_ssa = true; + dupl->src[0].ssa = itr->src[0].ssa; nir_ssa_dest_init(&dupl->instr, &dupl->dest, dupl->num_components, itr->dest.ssa.bit_size); diff --git a/src/gallium/drivers/lima/ir/lima_nir_lower_txp.c b/src/gallium/drivers/lima/ir/lima_nir_lower_txp.c index b010907..87eb27d 100644 --- a/src/gallium/drivers/lima/ir/lima_nir_lower_txp.c +++ b/src/gallium/drivers/lima/ir/lima_nir_lower_txp.c @@ -41,14 +41,6 @@ get_proj_index(nir_instr *coord_instr, nir_instr *proj_instr, proj_alu->op != nir_op_mov) return NULL; - if (!coord_alu->dest.dest.is_ssa || - !proj_alu->dest.dest.is_ssa) - return NULL; - - if (!coord_alu->src[0].src.is_ssa || - !proj_alu->src[0].src.is_ssa) - return NULL; - nir_ssa_def *coord_src_ssa = coord_alu->src[0].src.ssa; nir_ssa_def *proj_src_ssa = proj_alu->src[0].src.ssa; -- 2.7.4