summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAras Pranckevicius <aras@unity3d.com>2013-03-01 12:05:11 +0200
committerIan Romanick <ian.d.romanick@intel.com>2013-04-01 16:57:17 -0700
commitb2eee0869fde2d0ade19005524147c035ad764ea (patch)
treed7f7b1a32def3efcd5947aa442f5928fcb267878
parent62501c3af85089b423218a41a2e2433ac849c2d3 (diff)
GLSL: fix lower_jumps to report progress properly
A fix for lower_jumps progress reporting, very much like similar in c1e591eed. NOTE: This is a candidate for stable branches. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
-rw-r--r--src/glsl/lower_jumps.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/glsl/lower_jumps.cpp b/src/glsl/lower_jumps.cpp
index 92813f567f..bfc8c013bd 100644
--- a/src/glsl/lower_jumps.cpp
+++ b/src/glsl/lower_jumps.cpp
@@ -1002,10 +1002,12 @@ do_lower_jumps(exec_list *instructions, bool pull_out_jumps, bool lower_sub_retu
v.lower_sub_return = lower_sub_return;
v.lower_main_return = lower_main_return;
+ bool progress_ever = false;
do {
v.progress = false;
visit_exec_list(instructions, &v);
+ progress_ever = v.progress || progress_ever;
} while (v.progress);
- return v.progress;
+ return progress_ever;
}