diff options
| -rw-r--r-- | src/glsl/loop_analysis.cpp | 2 | ||||
| -rw-r--r-- | src/glsl/loop_controls.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/loop_analysis.cpp b/src/glsl/loop_analysis.cpp index f1268c04c4..32e8b8c85b 100644 --- a/src/glsl/loop_analysis.cpp +++ b/src/glsl/loop_analysis.cpp @@ -433,7 +433,7 @@ get_basic_induction_increment(ir_assignment *ir, hash_table *var_hash) ir_rvalue *inc = (op0 == var) ? rhs->operands[1] : rhs->operands[0]; - if (inc->constant_expression_value() == NULL) { + if (inc->as_constant() == NULL) { ir_variable *const inc_var = inc->variable_referenced(); if (inc_var != NULL) { loop_variable *lv = diff --git a/src/glsl/loop_controls.cpp b/src/glsl/loop_controls.cpp index d6a1e33fdb..17a0d2db81 100644 --- a/src/glsl/loop_controls.cpp +++ b/src/glsl/loop_controls.cpp @@ -204,12 +204,12 @@ loop_control_visitor::visit_leave(ir_loop *ir) * which. */ ir_rvalue *counter = cond->operands[0]->as_dereference_variable(); - ir_constant *limit = cond->operands[1]->constant_expression_value(); + ir_constant *limit = cond->operands[1]->as_constant(); enum ir_expression_operation cmp = cond->operation; if (limit == NULL) { counter = cond->operands[1]->as_dereference_variable(); - limit = cond->operands[0]->constant_expression_value(); + limit = cond->operands[0]->as_constant(); switch (cmp) { case ir_binop_less: cmp = ir_binop_gequal; break; |