From 710d41131b9715c5c378e0138d991f346647b9c8 Mon Sep 17 00:00:00 2001 From: Luca Barbieri Date: Tue, 7 Sep 2010 17:02:37 +0200 Subject: [PATCH] loop_controls: fix analysis of already analyzed loops The loop_controls pass didn't look at the counter values it put in ir_loop on previous iterations, so while the first iteration worked, subsequent ones couldn't determine max_iterations. --- src/glsl/loop_controls.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/glsl/loop_controls.cpp b/src/glsl/loop_controls.cpp index 17a0d2db816..9619d8ae555 100644 --- a/src/glsl/loop_controls.cpp +++ b/src/glsl/loop_controls.cpp @@ -182,7 +182,14 @@ loop_control_visitor::visit_leave(ir_loop *ir) * i is a loop induction variable, c is a constant, and < is any relative * operator. */ - int max_iterations = (ls->max_iterations < 0) ? INT_MAX : ls->max_iterations; + int max_iterations = ls->max_iterations; + + if(ir->from && ir->to && ir->increment) + max_iterations = calculate_iterations(ir->from, ir->to, ir->increment, (ir_expression_operation)ir->cmp); + + if(max_iterations < 0) + max_iterations = INT_MAX; + foreach_list(node, &ls->terminators) { loop_terminator *t = (loop_terminator *) node; ir_if *if_stmt = t->ir; -- 2.30.2