summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-07-20 16:47:25 -0700
committerEric Anholt <eric@anholt.net>2010-07-20 17:30:10 -0700
commit21b0dbd79937e9d6787f045af7d60d4b6c649ec8 (patch)
treeffba1dbb2896d9ab9ddc24a062b69763d55a1826
parentb6e92ad7da9d4f00607caca90bd0b8853623a493 (diff)
glsl2: talloc the glsl_struct_field[] we use to look up structure types.
Since the types are singletons across the lifetime of the compiler, repeatedly compiling a program with the same structure type defined would drop a copy of the array on the floor per compile. This is a bit tricky because the static GLSL types are not called with the talloc-based new, so we have to use the global type context, which may not be initialized yet.
-rw-r--r--src/glsl/ast_to_hir.cpp4
-rw-r--r--src/glsl/glsl_types.cpp15
-rw-r--r--src/glsl/glsl_types.h2
3 files changed, 17 insertions, 4 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 41371e7536..f20c7ead33 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2471,8 +2471,8 @@ ast_struct_specifier::hir(exec_list *instructions,
* the types to HIR. This ensures that structure definitions embedded in
* other structure definitions are processed.
*/
- glsl_struct_field *const fields = (glsl_struct_field *)
- malloc(sizeof(*fields) * decl_count);
+ glsl_struct_field *const fields = talloc_array(state, glsl_struct_field,
+ decl_count);
unsigned i = 0;
foreach_list_typed (ast_declarator_list, decl_list, link,
diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index 6ca141ef48..77c591ed69 100644
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -75,7 +75,20 @@ glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields,
name(name),
length(num_fields)
{
- this->fields.structure = fields;
+ unsigned int i;
+
+ if (glsl_type::ctx == NULL) {
+ glsl_type::ctx = talloc_init("glsl_type");
+ assert(glsl_type::ctx != NULL);
+ }
+
+ this->fields.structure = talloc_array(glsl_type::ctx,
+ glsl_struct_field, length);
+ for (i = 0; i < length; i++) {
+ this->fields.structure[i].type = fields[i].type;
+ this->fields.structure[i].name = talloc_strdup(this->fields.structure,
+ fields[i].name);
+ }
}
static void
diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h
index e869071cab..8ba9b5ff63 100644
--- a/src/glsl/glsl_types.h
+++ b/src/glsl/glsl_types.h
@@ -136,7 +136,7 @@ struct glsl_type {
union {
const struct glsl_type *array; /**< Type of array elements. */
const struct glsl_type *parameters; /**< Parameters to function. */
- const struct glsl_struct_field *structure;/**< List of struct fields. */
+ struct glsl_struct_field *structure; /**< List of struct fields. */
} fields;