Mesa (master): meta: Remove unsafe global mem_ctx pointer
Ian Romanick
idr at kemper.freedesktop.org
Mon Oct 8 03:36:01 UTC 2012
Module: Mesa
Branch: master
Commit: ab097dde0c958dd8b1c06a07ef8913512753760c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ab097dde0c958dd8b1c06a07ef8913512753760c
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Oct 5 15:11:31 2012 -0700
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 at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
---
src/mesa/drivers/common/meta.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index d0bb5e0..0c9ee59 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 =
More information about the mesa-commit
mailing list