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

Close memory leaks in glsl_type (constructor and get_array_instance) 

Add a talloc ctx to both get_array_instance and the glsl_type
constructor in order to be able to call talloc_size instead of
malloc.

This fix now makes glsl-orangebook-ch06-bump.frag 99.99% leak free:

	total heap usage: 55,623 allocs, 55,615

Only 8 missing frees now.
This commit is contained in:
Carl Worth 2010-06-18 17:52:59 -07:00
parent dc5811fd0c
commit 12c411504c
6 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ast_function.cpp
View File

@ -279,7 +279,8 @@ process_array_constructor(exec_list *instructions,
if (constructor_type->length == 0) {
constructor_type =
glsl_type::get_array_instance(constructor_type->element_type(),
glsl_type::get_array_instance(state,
constructor_type->element_type(),
parameter_count);
assert(constructor_type != NULL);
assert(constructor_type->length == parameter_count);

5
ast_to_hir.cpp
View File

@ -506,7 +506,8 @@ do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,
var->max_array_access);
}
var->type = glsl_type::get_array_instance(lhs->type->element_type(),
var->type = glsl_type::get_array_instance(state,
lhs->type->element_type(),
rhs->type->array_size());
}
}
@ -1409,7 +1410,7 @@ process_array_type(const glsl_type *base, ast_node *array_size,
}
}
return glsl_type::get_array_instance(base, length);
return glsl_type::get_array_instance(state, base, length);
}

11
glsl_types.cpp
View File

@ -574,7 +574,7 @@ _mesa_glsl_initialize_constructors(exec_list *instructions,
}
glsl_type::glsl_type(const glsl_type *array, unsigned length) :
glsl_type::glsl_type(void *ctx, const glsl_type *array, unsigned length) :
base_type(GLSL_TYPE_ARRAY),
sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),
sampler_type(0),
@ -588,7 +588,7 @@ glsl_type::glsl_type(const glsl_type *array, unsigned length) :
* NUL.
*/
const unsigned name_length = strlen(array->name) + 10 + 3;
char *const n = (char *) malloc(name_length);
char *const n = (char *) talloc_size(ctx, name_length);
if (length == 0)
snprintf(n, name_length, "%s[]", array->name);
@ -691,9 +691,10 @@ glsl_type::array_key_hash(const void *a)
const glsl_type *
glsl_type::get_array_instance(const glsl_type *base, unsigned array_size)
glsl_type::get_array_instance(void *ctx, const glsl_type *base,
unsigned array_size)
{
const glsl_type key(base, array_size);
const glsl_type key(ctx, base, array_size);
if (array_types == NULL) {
array_types = hash_table_ctor(64, array_key_hash, array_key_compare);
@ -701,7 +702,7 @@ glsl_type::get_array_instance(const glsl_type *base, unsigned array_size)
const glsl_type *t = (glsl_type *) hash_table_find(array_types, & key);
if (t == NULL) {
t = new glsl_type(base, array_size);
t = new glsl_type(ctx, base, array_size);
hash_table_insert(array_types, (void *) t, t);
}

5
glsl_types.h
View File

@ -198,7 +198,8 @@ struct glsl_type {
/**
* Get the instance of an array type
*/
static const glsl_type *get_array_instance(const glsl_type *base,
static const glsl_type *get_array_instance(void *ctx,
const glsl_type *base,
unsigned elements);
/**
@ -387,7 +388,7 @@ private:
/**
* Constructor for array types
*/
glsl_type(const glsl_type *array, unsigned length);
glsl_type(void *ctx, const glsl_type *array, unsigned length);
/** Hash table containing the known array types. */
static struct hash_table *array_types;

2
ir_reader.cpp
View File

@ -138,7 +138,7 @@ read_type(_mesa_glsl_parse_state *st, s_expression *expr)
return NULL;
}
return glsl_type::get_array_instance(base_type, size->value());
return glsl_type::get_array_instance(st, base_type, size->value());
} else if (strcmp(type_sym->value(), "struct") == 0) {
assert(false); // FINISHME
} else {

17
ir_variable.cpp
View File

@ -104,7 +104,7 @@ generate_110_uniforms(exec_list *instructions,
* FINISHME: for now.
*/
const glsl_type *const mat4_array_type =
glsl_type::get_array_instance(glsl_type::mat4_type, 4);
glsl_type::get_array_instance(symtab, glsl_type::mat4_type, 4);
add_variable("gl_TextureMatrix", ir_var_uniform, -1, mat4_array_type,
instructions, symtab);
@ -122,7 +122,8 @@ generate_110_uniforms(exec_list *instructions,
* FINISHME: at least 8, so hard-code 8 for now.
*/
const glsl_type *const light_source_array_type =
glsl_type::get_array_instance(symtab->get_type("gl_LightSourceParameters"), 8);
glsl_type::get_array_instance(symtab,
symtab->get_type("gl_LightSourceParameters"), 8);
add_variable("gl_LightSource", ir_var_uniform, -1, light_source_array_type,
instructions, symtab);
@ -157,7 +158,7 @@ generate_110_vs_variables(exec_list *instructions,
* FINISHME: for now.
*/
const glsl_type *const vec4_array_type =
glsl_type::get_array_instance(glsl_type::vec4_type, 4);
glsl_type::get_array_instance(symtab, glsl_type::vec4_type, 4);
add_variable("gl_TexCoord", ir_var_out, VERT_RESULT_TEX0, vec4_array_type,
instructions, symtab);
@ -179,6 +180,7 @@ static void
generate_130_vs_variables(exec_list *instructions,
glsl_symbol_table *symtab)
{
void *ctx = symtab;
generate_120_vs_variables(instructions, symtab);
for (unsigned i = 0; i < Elements(builtin_130_vs_variables); i++) {
@ -190,7 +192,7 @@ generate_130_vs_variables(exec_list *instructions,
* FINISHME: the value of GL_MAX_CLIP_DISTANCES.
*/
const glsl_type *const clip_distance_array_type =
glsl_type::get_array_instance(glsl_type::float_type, 8);
glsl_type::get_array_instance(ctx, glsl_type::float_type, 8);
/* FINISHME: gl_ClipDistance needs a real location assigned. */
add_variable("gl_ClipDistance", ir_var_out, -1, clip_distance_array_type,
@ -240,7 +242,7 @@ generate_110_fs_variables(exec_list *instructions,
* FINISHME: for now.
*/
const glsl_type *const vec4_array_type =
glsl_type::get_array_instance(glsl_type::vec4_type, 4);
glsl_type::get_array_instance(symtab, glsl_type::vec4_type, 4);
add_variable("gl_TexCoord", ir_var_in, FRAG_ATTRIB_TEX0, vec4_array_type,
instructions, symtab);
@ -256,7 +258,7 @@ generate_ARB_draw_buffers_fs_variables(exec_list *instructions,
* FINISHME: at least 1, so hard-code 1 for now.
*/
const glsl_type *const vec4_array_type =
glsl_type::get_array_instance(glsl_type::vec4_type, 1);
glsl_type::get_array_instance(symtab, glsl_type::vec4_type, 1);
ir_variable *const fd =
add_variable("gl_FragData", ir_var_out, FRAG_RESULT_DATA0,
@ -279,13 +281,14 @@ static void
generate_130_fs_variables(exec_list *instructions,
glsl_symbol_table *symtab)
{
void *ctx = symtab;
generate_120_fs_variables(instructions, symtab);
/* FINISHME: The size of this array is implementation dependent based on
* FINISHME: the value of GL_MAX_CLIP_DISTANCES.
*/
const glsl_type *const clip_distance_array_type =
glsl_type::get_array_instance(glsl_type::float_type, 8);
glsl_type::get_array_instance(ctx, glsl_type::float_type, 8);
/* FINISHME: gl_ClipDistance needs a real location assigned. */
add_variable("gl_ClipDistance", ir_var_in, -1, clip_distance_array_type,