Mesa (master): glsl: remove unreachable assert()
Emil Velikov
evelikov at kemper.freedesktop.org
Tue Apr 10 15:17:36 UTC 2018
Module: Mesa
Branch: master
Commit: 8eceac9de7d3cd4fddabbe61d512acfed9812169
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8eceac9de7d3cd4fddabbe61d512acfed9812169
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Wed Mar 28 18:21:59 2018 +0100
glsl: remove unreachable assert()
Earlier commit enforced that we'll bail out if the number of terminators
is different than 2. With that in mind, the assert() will never trigger.
Fixes: 56b867395de ("glsl: fix infinite loop caused by bug in loop
unrolling pass")
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
src/compiler/glsl/loop_unroll.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/compiler/glsl/loop_unroll.cpp b/src/compiler/glsl/loop_unroll.cpp
index f6efe6475a..874f418568 100644
--- a/src/compiler/glsl/loop_unroll.cpp
+++ b/src/compiler/glsl/loop_unroll.cpp
@@ -528,8 +528,6 @@ loop_unroll_visitor::visit_leave(ir_loop *ir)
unsigned term_count = 0;
bool first_term_then_continue = false;
foreach_in_list(loop_terminator, t, &ls->terminators) {
- assert(term_count < 2);
-
ir_if *ir_if = t->ir->as_if();
assert(ir_if != NULL);
More information about the mesa-commit
mailing list