AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert everything from the talloc API to the ralloc API.

Browse Source
This commit is contained in:
Kenneth Graunke
2011-01-21 14:32:31 -08:00
parent dc55254f5b
commit d3073f58c1
67 changed files with 590 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/glsl/ast_function.cpp
View File

@@ -66,7 +66,7 @@ process_parameters(exec_list *instructions, exec_list *actual_parameters,
* formal or actual parameter list. Only the type is used.
*
* \return
* A talloced string representing the prototype of the function.
* A ralloced string representing the prototype of the function.
*/
char *
prototype_string(const glsl_type *return_type, const char *name,
@@ -75,19 +75,19 @@ prototype_string(const glsl_type *return_type, const char *name,
char *str = NULL;
if (return_type != NULL)
str = talloc_asprintf(str, "%s ", return_type->name);
ralloc_asprintf(&str, "%s ", return_type->name);
str = talloc_asprintf_append(str, "%s(", name);
ralloc_asprintf_append(&str, "%s(", name);
const char *comma = "";
foreach_list(node, parameters) {
const ir_instruction *const param = (ir_instruction *) node;
str = talloc_asprintf_append(str, "%s%s", comma, param->type->name);
ralloc_asprintf_append(&str, "%s%s", comma, param->type->name);
comma = ", ";
}
str = talloc_strdup_append(str, ")");
ralloc_strcat(&str, ")");
return str;
}
@@ -188,7 +188,7 @@ match_function_by_name(exec_list *instructions, const char *name,
ir_dereference_variable *deref;
var = new(ctx) ir_variable(sig->return_type,
talloc_asprintf(ctx, "%s_retval",
ralloc_asprintf(ctx, "%s_retval",
sig->function_name()),
ir_var_temporary);
instructions->push_tail(var);
@@ -210,7 +210,7 @@ match_function_by_name(exec_list *instructions, const char *name,
_mesa_glsl_error(loc, state, "no matching function for call to `%s'",
str);
talloc_free(str);
ralloc_free(str);
const char *prefix = "candidates are: ";
@@ -226,7 +226,7 @@ match_function_by_name(exec_list *instructions, const char *name,
str = prototype_string(sig->return_type, f->name, &sig->parameters);
_mesa_glsl_error(loc, state, "%s%s\n", prefix, str);
talloc_free(str);
ralloc_free(str);
prefix = " ";
}
@@ -247,7 +247,7 @@ match_function_by_name(exec_list *instructions, const char *name,
static ir_rvalue *
convert_component(ir_rvalue *src, const glsl_type *desired_type)
{
void *ctx = talloc_parent(src);
void *ctx = ralloc_parent(src);
const unsigned a = desired_type->base_type;
const unsigned b = src->type->base_type;
ir_expression *result = NULL;
@@ -310,7 +310,7 @@ convert_component(ir_rvalue *src, const glsl_type *desired_type)
static ir_rvalue *
dereference_component(ir_rvalue *src, unsigned component)
{
void *ctx = talloc_parent(src);
void *ctx = ralloc_parent(src);
assert(component < src->type->components());
/* If the source is a constant, just create a new constant instead of a