From ac0e9e343c0c009875be186f90c951d5465b5371 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 25 Jan 2018 13:44:19 -0700 Subject: [PATCH] mesa: remove MESA_FUNCTION Just use __func__ in the two macros where it was used. Reviewed-by: Neha Bhende --- src/mesa/main/context.h | 4 ++-- src/mesa/main/mtypes.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h index 5d9e2ede473..86be66f9e09 100644 --- a/src/mesa/main/context.h +++ b/src/mesa/main/context.h @@ -206,7 +206,7 @@ _mesa_inside_dlist_begin_end(const struct gl_context *ctx) #define FLUSH_VERTICES(ctx, newstate) \ do { \ if (MESA_VERBOSE & VERBOSE_STATE) \ - _mesa_debug(ctx, "FLUSH_VERTICES in %s\n", MESA_FUNCTION);\ + _mesa_debug(ctx, "FLUSH_VERTICES in %s\n", __func__); \ if (ctx->Driver.NeedFlush & FLUSH_STORED_VERTICES) \ vbo_exec_FlushVertices(ctx, FLUSH_STORED_VERTICES); \ ctx->NewState |= newstate; \ @@ -225,7 +225,7 @@ do { \ #define FLUSH_CURRENT(ctx, newstate) \ do { \ if (MESA_VERBOSE & VERBOSE_STATE) \ - _mesa_debug(ctx, "FLUSH_CURRENT in %s\n", MESA_FUNCTION); \ + _mesa_debug(ctx, "FLUSH_CURRENT in %s\n", __func__); \ if (ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) \ vbo_exec_FlushVertices(ctx, FLUSH_UPDATE_CURRENT); \ ctx->NewState |= newstate; \ diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 20aa80a52f2..361b63c1c40 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -5121,11 +5121,9 @@ struct gl_memory_info #ifdef DEBUG extern int MESA_VERBOSE; extern int MESA_DEBUG_FLAGS; -# define MESA_FUNCTION __func__ #else # define MESA_VERBOSE 0 # define MESA_DEBUG_FLAGS 0 -# define MESA_FUNCTION "a function" #endif -- 2.11.0