From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 2 Aug 2010 18:35:14 +0000 (-0700)
Subject: glsl2: Make glsl_types::ctx private again
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cf41c8a0d8dac52bafb7c3e85171566c492786ab;p=mesa.git

glsl2: Make glsl_types::ctx private again
---

diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index ce47b8167f4..d8e291c8814 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 4bec3181679..bae8cdb2332 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,