diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-04-26 14:59:16 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-04-26 14:59:16 -0700 |
| commit | 230ade93a6efeb7a1cbbae1d2226a91f08890ae8 (patch) | |
| tree | e10e5cf2a7d50f492dfb471b4cfd77542144993c | |
| parent | c11f1a4fb07f09a6b804c5d0e4bb12cd5137fafa (diff) | |
Make private glsl_type singletons public
| -rw-r--r-- | glsl_types.h | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/glsl_types.h b/glsl_types.h index c628868301..2bdfeb8cb6 100644 --- 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; |