From 230ade93a6efeb7a1cbbae1d2226a91f08890ae8 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 26 Apr 2010 14:59:16 -0700 Subject: [PATCH] Make private glsl_type singletons public --- glsl_types.h | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/glsl_types.h b/glsl_types.h index c6288683013..2bdfeb8cb60 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; -- 2.30.2