diff options
author | Kenneth Graunke <kenneth@whitecape.org> | 2010-08-03 20:05:53 -0700 |
---|---|---|
committer | Kenneth Graunke <kenneth@whitecape.org> | 2010-08-04 15:57:19 -0700 |
commit | ad98aa9d93646600cc95b3e45a40eec26f18988a (patch) | |
tree | acf5fabf216947bd9529c68edbc0bb3fdaa0f870 /src/glsl/glsl_types.h | |
parent | ea3a9eb53a3c9ed99998ead645e2b2e6a3261626 (diff) |
glsl2: Remove uses of deprecated TALLOC_CTX type.
Diffstat (limited to 'src/glsl/glsl_types.h')
-rw-r--r-- | src/glsl/glsl_types.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h index c3f81b82aa..97d0d98c62 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); |