From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 5 Oct 2012 22:11:31 +0000 (-0700)
Subject: meta: Remove unsafe global mem_ctx pointer
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ab097dde0c958dd8b1c06a07ef8913512753760c;p=mesa.git

meta: Remove unsafe global mem_ctx pointer

NOTE: This is a candidate for the 9.0 branch.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
---

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index d0bb5e0aeb9..0c9ee591859 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -78,7 +78,6 @@
 #include "main/glformats.h"
 #include "../glsl/ralloc.h"
 
-static void *mem_ctx;
 /** Return offset in bytes of the field within a vertex struct */
 #define OFFSET(FIELD) ((void *) offsetof(struct vertex, FIELD))
 
@@ -3073,6 +3072,7 @@ setup_glsl_generate_mipmap(struct gl_context *ctx,
    char *fs_source;
    const char *extension_mode;
    GLuint vs, fs;
+   void *mem_ctx;
 
    if (ctx->Const.GLSLVersion < 130) {
       vs_source =