projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl: Remove integer matrix support from ir_dereference_array::constant_expression_value
[mesa.git]
/
src
/
compiler
/
glsl
/
opt_if_simplification.cpp
diff --git
a/src/compiler/glsl/opt_if_simplification.cpp
b/src/compiler/glsl/opt_if_simplification.cpp
index e05f03190aa10e8d7035e4787b0e4e231b18be8b..136ef8772942025acf9a0efe600c84179382a444 100644
(file)
--- a/
src/compiler/glsl/opt_if_simplification.cpp
+++ b/
src/compiler/glsl/opt_if_simplification.cpp
@@
-84,7
+84,8
@@
ir_if_simplification_visitor::visit_leave(ir_if *ir)
* FINISHME: This can probably be done with some flags, but it would take
* FINISHME: some work to get right.
*/
* FINISHME: This can probably be done with some flags, but it would take
* FINISHME: some work to get right.
*/
- ir_constant *condition_constant = ir->condition->constant_expression_value();
+ ir_constant *condition_constant =
+ ir->condition->constant_expression_value(ralloc_parent(ir));
if (condition_constant) {
/* Move the contents of the one branch of the conditional
* that matters out.
if (condition_constant) {
/* Move the contents of the one branch of the conditional
* that matters out.