Convert everything from the talloc API to the ralloc API.
This commit is contained in:
@@ -65,7 +65,7 @@ public:
|
||||
|
||||
ir_variable **components;
|
||||
|
||||
/** talloc_parent(this->var) -- the shader's talloc context. */
|
||||
/** ralloc_parent(this->var) -- the shader's ralloc context. */
|
||||
void *mem_ctx;
|
||||
};
|
||||
|
||||
@@ -74,13 +74,13 @@ class ir_structure_reference_visitor : public ir_hierarchical_visitor {
|
||||
public:
|
||||
ir_structure_reference_visitor(void)
|
||||
{
|
||||
this->mem_ctx = talloc_new(NULL);
|
||||
this->mem_ctx = ralloc_context(NULL);
|
||||
this->variable_list.make_empty();
|
||||
}
|
||||
|
||||
~ir_structure_reference_visitor(void)
|
||||
{
|
||||
talloc_free(mem_ctx);
|
||||
ralloc_free(mem_ctx);
|
||||
}
|
||||
|
||||
virtual ir_visitor_status visit(ir_variable *);
|
||||
@@ -322,7 +322,7 @@ do_structure_splitting(exec_list *instructions)
|
||||
if (refs.variable_list.is_empty())
|
||||
return false;
|
||||
|
||||
void *mem_ctx = talloc_new(NULL);
|
||||
void *mem_ctx = ralloc_context(NULL);
|
||||
|
||||
/* Replace the decls of the structures to be split with their split
|
||||
* components.
|
||||
@@ -331,14 +331,14 @@ do_structure_splitting(exec_list *instructions)
|
||||
variable_entry2 *entry = (variable_entry2 *)iter.get();
|
||||
const struct glsl_type *type = entry->var->type;
|
||||
|
||||
entry->mem_ctx = talloc_parent(entry->var);
|
||||
entry->mem_ctx = ralloc_parent(entry->var);
|
||||
|
||||
entry->components = talloc_array(mem_ctx,
|
||||
entry->components = ralloc_array(mem_ctx,
|
||||
ir_variable *,
|
||||
type->length);
|
||||
|
||||
for (unsigned int i = 0; i < entry->var->type->length; i++) {
|
||||
const char *name = talloc_asprintf(mem_ctx, "%s_%s",
|
||||
const char *name = ralloc_asprintf(mem_ctx, "%s_%s",
|
||||
entry->var->name,
|
||||
type->fields.structure[i].name);
|
||||
|
||||
@@ -355,7 +355,7 @@ do_structure_splitting(exec_list *instructions)
|
||||
ir_structure_splitting_visitor split(&refs.variable_list);
|
||||
visit_list_elements(&split, instructions);
|
||||
|
||||
talloc_free(mem_ctx);
|
||||
ralloc_free(mem_ctx);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user