[Mesa-dev] [PATCH 1/6] meta: Remove unsafe global mem_ctx pointer

Ian Romanick idr at freedesktop.org
Fri Oct 5 15:56:47 PDT 2012


From: Ian Romanick <ian.d.romanick at intel.com>

NOTE: This is a candidate for the 9.0 branch.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 src/mesa/drivers/common/meta.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 =
-- 
1.7.11.4



More information about the mesa-dev mailing list