diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-08-02 11:35:14 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-08-02 13:53:32 -0700 |
| commit | cf41c8a0d8dac52bafb7c3e85171566c492786ab (patch) | |
| tree | 8a611d3bc5b4d1ca253e7e1415d72ffe4a9f6edc | |
| parent | eb7e120f0f342541716882c211eca115c2cd0d21 (diff) | |
glsl2: Make glsl_types::ctx private again
| -rw-r--r-- | src/glsl/glsl_types.cpp | 4 | ||||
| -rw-r--r-- | src/glsl/glsl_types.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp index ce47b8167f..d8e291c881 100644 --- a/src/glsl/glsl_types.cpp +++ b/src/glsl/glsl_types.cpp @@ -35,8 +35,8 @@ hash_table *glsl_type::array_types = NULL; hash_table *glsl_type::record_types = NULL; void *glsl_type::ctx = NULL; -static void -init_talloc_type_ctx(void) +void +glsl_type::init_talloc_type_ctx(void) { if (glsl_type::ctx == NULL) { glsl_type::ctx = talloc_init("glsl_type"); diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h index 4bec318167..bae8cdb233 100644 --- a/src/glsl/glsl_types.h +++ b/src/glsl/glsl_types.h @@ -388,6 +388,7 @@ struct glsl_type { return is_array() ? length : -1; } +private: /** * talloc context for all glsl_type allocations * @@ -395,7 +396,8 @@ struct glsl_type { */ static TALLOC_CTX *ctx; -private: + void init_talloc_type_ctx(void); + /** Constructor for vector and matrix types */ glsl_type(GLenum gl_type, unsigned base_type, unsigned vector_elements, |