aboutsummaryrefslogtreecommitdiffstats
path: root/src/compiler/glsl/opt_constant_folding.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/compiler/glsl/opt_constant_folding.cpp')
-rw-r--r--src/compiler/glsl/opt_constant_folding.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/compiler/glsl/opt_constant_folding.cpp b/src/compiler/glsl/opt_constant_folding.cpp
index 0ea53a5ed1b..ee67420adf8 100644
--- a/src/compiler/glsl/opt_constant_folding.cpp
+++ b/src/compiler/glsl/opt_constant_folding.cpp
@@ -85,6 +85,12 @@ ir_constant_fold(ir_rvalue **rvalue)
if (swiz && !swiz->val->as_constant())
return false;
+ /* Ditto for array dereferences */
+ ir_dereference_array *array_ref = (*rvalue)->as_dereference_array();
+ if (array_ref && (!array_ref->array->as_constant() ||
+ !array_ref->array_index->as_constant()))
+ return false;
+
ir_constant *constant = (*rvalue)->constant_expression_value();
if (constant) {
*rvalue = constant;