Make private glsl_type singletons public

diff --git a/glsl_types.h b/glsl_types.h
index c6288683013091e392ad30c6ffb79936fc46efca..2bdfeb8cb6015d31d8e65dbc685b42dd7b35de92 100644 (file)
--- a/glsl_types.h
+++ b/glsl_types.h
@@ -114,6 +114,15 @@ struct glsl_type {
    static const glsl_type *const vec3_type;
    static const glsl_type *const vec4_type;
    static const glsl_type *const bool_type;
+   static const glsl_type *const mat2_type;
+   static const glsl_type *const mat2x3_type;
+   static const glsl_type *const mat2x4_type;
+   static const glsl_type *const mat3x2_type;
+   static const glsl_type *const mat3_type;
+   static const glsl_type *const mat3x4_type;
+   static const glsl_type *const mat4x2_type;
+   static const glsl_type *const mat4x3_type;
+   static const glsl_type *const mat4_type;
    /*@}*/
 
 
@@ -342,22 +351,6 @@ private:
     */
    glsl_type(const glsl_type *array, unsigned length);
 
-
-   /**
-    * \name Pointers to various private type singletons
-    */
-   /*@{*/
-   static const glsl_type *const mat2_type;
-   static const glsl_type *const mat2x3_type;
-   static const glsl_type *const mat2x4_type;
-   static const glsl_type *const mat3x2_type;
-   static const glsl_type *const mat3_type;
-   static const glsl_type *const mat3x4_type;
-   static const glsl_type *const mat4x2_type;
-   static const glsl_type *const mat4x3_type;
-   static const glsl_type *const mat4_type;
-   /*@}*/
-
    /** Hash table containing the known array types. */
    static struct hash_table *array_types;