Mesa (glsl2): glsl2: Make glsl_types::ctx private again
Ian Romanick
idr at kemper.freedesktop.org
Mon Aug 2 21:57:40 UTC 2010
Module: Mesa
Branch: glsl2
Commit: cf41c8a0d8dac52bafb7c3e85171566c492786ab
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf41c8a0d8dac52bafb7c3e85171566c492786ab
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon Aug 2 11:35:14 2010 -0700
glsl2: Make glsl_types::ctx private again
---
src/glsl/glsl_types.cpp | 4 ++--
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 ce47b81..d8e291c 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 4bec318..bae8cdb 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,
More information about the mesa-commit
mailing list