diff options
| author | Eric Anholt <eric@anholt.net> | 2010-08-04 12:57:58 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-08-04 12:57:58 -0700 |
| commit | 952d0f88e1741d51b641be75f7c5a6565e245a69 (patch) | |
| tree | 6f5db4785da76588eb645a21c54c635a88a67a96 /src/glsl/ir_constant_expression.cpp | |
| parent | 8273bd46877e2ea2b8a02b87a11c68102d07e1f2 (diff) | |
glsl2: Skip talloc_parent in constant_expression of non-constant arrays.
Diffstat (limited to 'src/glsl/ir_constant_expression.cpp')
| -rw-r--r-- | src/glsl/ir_constant_expression.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp index 677353e542..0a924246da 100644 --- a/src/glsl/ir_constant_expression.cpp +++ b/src/glsl/ir_constant_expression.cpp @@ -690,11 +690,11 @@ ir_dereference_variable::constant_expression_value() ir_constant * ir_dereference_array::constant_expression_value() { - void *ctx = talloc_parent(this); ir_constant *array = this->array->constant_expression_value(); ir_constant *idx = this->array_index->constant_expression_value(); if ((array != NULL) && (idx != NULL)) { + void *ctx = talloc_parent(this); if (array->type->is_matrix()) { /* Array access of a matrix results in a vector. */ |