glsl_type: Record type constructors are private

diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index 672a7f7cd17e34006d48245c07c39e79c173f630..f910efdddef43338a4eddf60efa9a2d0e3006b0e 100644 (file)
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -65,6 +65,18 @@ glsl_type::glsl_type(GLenum gl_type,
    memset(& fields, 0, sizeof(fields));
 }
 
+glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields,
+                    const char *name) :
+   base_type(GLSL_TYPE_STRUCT),
+   sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),
+   sampler_type(0),
+   vector_elements(0), matrix_columns(0),
+   name(name),
+   length(num_fields)
+{
+   this->fields.structure = fields;
+}
+
 static void
 add_types_to_symbol_table(glsl_symbol_table *symtab,
                          const struct glsl_type *types,

diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h
index a1c9fae4f9f81bb0a63357b1dfe8b6e8e10954c5..fc94bea1ccc04f2e55f9b9b1df0b7038d0251ce2 100644 (file)
--- a/src/glsl/glsl_types.h
+++ b/src/glsl/glsl_types.h
@@ -158,18 +158,6 @@ struct glsl_type {
    /*@}*/
 
 
-   glsl_type(const glsl_struct_field *fields, unsigned num_fields,
-            const char *name) :
-      base_type(GLSL_TYPE_STRUCT),
-      sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),
-      sampler_type(0),
-      vector_elements(0), matrix_columns(0),
-      name(name),
-      length(num_fields)
-   {
-      this->fields.structure = fields;
-   }
-
    /**
     * For numeric and boolean derrived types returns the basic scalar type
     *
@@ -404,6 +392,10 @@ private:
             enum glsl_sampler_dim dim, bool shadow, bool array,
             unsigned type, const char *name);
 
+   /** Constructor for record types */
+   glsl_type(const glsl_struct_field *fields, unsigned num_fields,
+            const char *name);
+
    /** Constructor for array types */
    glsl_type(void *ctx, const glsl_type *array, unsigned length);