aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2012-10-05 15:11:31 -0700
committerIan Romanick <[email protected]>2012-10-07 20:34:17 -0700
commitab097dde0c958dd8b1c06a07ef8913512753760c (patch)
tree922f5a4587dfae5c5977764ee331ff2a6bb5f4f8
parent6ef37f71b0a0460808bb68a9102c15f313492c9f (diff)
meta: Remove unsafe global mem_ctx pointer
NOTE: This is a candidate for the 9.0 branch. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Anuj Phogat <[email protected]>
-rw-r--r--src/mesa/drivers/common/meta.c2
1 files changed, 1 insertions, 1 deletions
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 =