glsl2: Make the clone() method take a talloc context.

In most cases, we needed to be reparenting the cloned IR to a
different context (for example, to the linked shader instead of the
unlinked shader), or optimization before the reparent would cause
memory usage of the original object to grow and grow.
This commit is contained in:
Eric Anholt
2010-08-04 12:34:56 -07:00
parent 84ee01f40a
commit 8273bd4687
9 changed files with 130 additions and 131 deletions

View File

@@ -680,7 +680,10 @@ ir_dereference_variable::constant_expression_value()
if (var->mode == ir_var_uniform)
return NULL;
return var->constant_value ? var->constant_value->clone(NULL) : NULL;
if (!var->constant_value)
return NULL;
return var->constant_value->clone(talloc_parent(var), NULL);
}
@@ -732,7 +735,7 @@ ir_dereference_array::constant_expression_value()
return new(ctx) ir_constant(array, component);
} else {
const unsigned index = idx->value.u[0];
return array->get_array_element(index)->clone(NULL);
return array->get_array_element(index)->clone(ctx, NULL);
}
}
return NULL;