From: Dave Airlie Date: Sat, 15 Sep 2012 03:09:05 +0000 (+1000) Subject: meta: make mem_ctx non-global. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=36639ec6e9a2758e344235fbdc1450719d8851e3;p=mesa.git meta: make mem_ctx non-global. I can't see any external users, and this is a global symbol, Reviewed-by: Matt Turner Signed-off-by: Dave Airlie --- diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 677548e94eb..ff701ba871b 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -78,7 +78,7 @@ #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)) diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h index 8a6b33b3235..d8dfb56f9b1 100644 --- a/src/mesa/drivers/common/meta.h +++ b/src/mesa/drivers/common/meta.h @@ -58,8 +58,6 @@ #define MESA_META_MULTISAMPLE 0x100000 /**\}*/ -void *mem_ctx; - extern void _mesa_meta_init(struct gl_context *ctx);