From: Xavier Bouchoux Date: Wed, 28 Jan 2015 01:31:58 +0000 (+0100) Subject: r600g/sb: fix a bug in constants folding optimisation pass X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2fd21c4098f4574f896d7baeec6a8e5f3b7783ab;p=mesa.git r600g/sb: fix a bug in constants folding optimisation pass ADD R6.y.1, R5.w.1, ~1|3f800000 ADD R6.y.2, |R6.y.1|, -0.0001|b8d1b717 was wrongly being converted to ADD R6.y.1, R5.w.1, ~1|3f800000 ADD R6.y.2, R5.w.1, -1.0001|bf800347 because abs() modifier was ignored. Signed-off-by: Xavier Bouchoux Reviewed-by: Glenn Kennard --- diff --git a/src/gallium/drivers/r600/sb/sb_expr.cpp b/src/gallium/drivers/r600/sb/sb_expr.cpp index 52c0c1796ba..9c2274e65a3 100644 --- a/src/gallium/drivers/r600/sb/sb_expr.cpp +++ b/src/gallium/drivers/r600/sb/sb_expr.cpp @@ -645,6 +645,7 @@ bool expr_handler::fold_assoc(alu_node *n) { (op == ALU_OP2_MUL_IEEE && d0->is_alu_op(ALU_OP2_MUL))) && !d0->bc.omod && !d0->bc.clamp && + !a->bc.src[0].abs && (!a->bc.src[0].neg || allow_neg)) { cur_neg ^= a->bc.src[0].neg; a = d0; @@ -678,6 +679,7 @@ bool expr_handler::fold_assoc(alu_node *n) { (op == ALU_OP2_MUL_IEEE && d1->is_alu_op(ALU_OP2_MUL))) && !d1->bc.omod && !d1->bc.clamp && + !a->bc.src[1].abs && (!a->bc.src[1].neg || allow_neg)) { cur_neg ^= a->bc.src[1].neg; a = d1;