glsl2: Remove uses of deprecated TALLOC_CTX type.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h
index c3f81b82aa0..97d0d98c624 100644
--- a/src/glsl/glsl_types.h
+++ b/src/glsl/glsl_types.h
@@ -76,17 +76,17 @@ struct glsl_type {
 				*/
 
    /* Callers of this talloc-based new need not call delete. It's
-    * easier to just talloc_free 'ctx' (or any of its ancestors). */
+    * easier to just talloc_free 'mem_ctx' (or any of its ancestors). */
    static void* operator new(size_t size)
    {
-      if (glsl_type::ctx == NULL) {
-	 glsl_type::ctx = talloc_init("glsl_type");
-	 assert(glsl_type::ctx != NULL);
+      if (glsl_type::mem_ctx == NULL) {
+	 glsl_type::mem_ctx = talloc_init("glsl_type");
+	 assert(glsl_type::mem_ctx != NULL);
       }
 
       void *type;
 
-      type = talloc_size(glsl_type::ctx, size);
+      type = talloc_size(glsl_type::mem_ctx, size);
       assert(type != NULL);
 
       return type;
@@ -394,7 +394,7 @@ private:
     *
     * Set on the first call to \c glsl_type::new.
     */
-   static TALLOC_CTX *ctx;
+   static void *mem_ctx;
 
    void init_talloc_type_ctx(void);