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.

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 41371e75367831be831c010b2d09743787cf2de3..f20c7ead336686fcf7d84ceab75987cdfb5976c1 100644 (file)
--- 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 6ca141ef481de2d5eae8cb1fe4281155137e1c1c..77c591ed691fed32fbaade30a9b5b60c3b5d4b4e 100644 (file)
--- 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 e869071cab0cdb387c8f0649736bd06dbb80c622..8ba9b5ff635f9eed57eb93161e1b1a029368c607 100644 (file)
--- 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;