<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<style type="text/css" style="display:none;"><!-- P {margin-top:0;margin-bottom:0;} --></style>
</head>
<body dir="ltr">
<div id="divtagdefaultwrapper" style="font-size:12pt;color:#000000;font-family:Calibri,Helvetica,sans-serif;" dir="ltr">
<p style="margin-top:0;margin-bottom:0">For series,</p>
<p style="margin-top:0;margin-bottom:0"><br>
</p>
<p style="margin-top:0;margin-bottom:0">Reviewed-by: Neha Bhende<bhenden@vmware.com><br>
</p>
<p style="margin-top:0;margin-bottom:0"><br>
</p>
<div id="Signature">
<div id="divtagdefaultwrapper" style="font-size: 12pt; color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); font-family: Calibri, Arial, Helvetica, sans-serif, "EmojiFont", "Apple Color Emoji", "Segoe UI Emoji", NotoColorEmoji, "Segoe UI Symbol", "Android Emoji", EmojiSymbols;">
<p>Regards,</p>
<p>Neha<br>
</p>
</div>
</div>
</div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> Brian Paul <brianp@vmware.com><br>
<b>Sent:</b> Friday, January 26, 2018 8:39:18 AM<br>
<b>To:</b> mesa-dev@lists.freedesktop.org<br>
<b>Cc:</b> Charmaine Lee; Neha Bhende<br>
<b>Subject:</b> [PATCH 3/3] mesa: remove MESA_FUNCTION</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">Just use __func__ in the two macros where it was used.<br>
---<br>
src/mesa/main/context.h | 4 ++--<br>
src/mesa/main/mtypes.h | 2 --<br>
2 files changed, 2 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h<br>
index 5d9e2ed..86be66f 100644<br>
--- a/src/mesa/main/context.h<br>
+++ b/src/mesa/main/context.h<br>
@@ -206,7 +206,7 @@ _mesa_inside_dlist_begin_end(const struct gl_context *ctx)<br>
#define FLUSH_VERTICES(ctx, newstate) \<br>
do { \<br>
if (MESA_VERBOSE & VERBOSE_STATE) \<br>
- _mesa_debug(ctx, "FLUSH_VERTICES in %s\n", MESA_FUNCTION);\<br>
+ _mesa_debug(ctx, "FLUSH_VERTICES in %s\n", __func__); \<br>
if (ctx->Driver.NeedFlush & FLUSH_STORED_VERTICES) \<br>
vbo_exec_FlushVertices(ctx, FLUSH_STORED_VERTICES); \<br>
ctx->NewState |= newstate; \<br>
@@ -225,7 +225,7 @@ do { \<br>
#define FLUSH_CURRENT(ctx, newstate) \<br>
do { \<br>
if (MESA_VERBOSE & VERBOSE_STATE) \<br>
- _mesa_debug(ctx, "FLUSH_CURRENT in %s\n", MESA_FUNCTION); \<br>
+ _mesa_debug(ctx, "FLUSH_CURRENT in %s\n", __func__); \<br>
if (ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) \<br>
vbo_exec_FlushVertices(ctx, FLUSH_UPDATE_CURRENT); \<br>
ctx->NewState |= newstate; \<br>
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h<br>
index 54159bb..9cd32c3 100644<br>
--- a/src/mesa/main/mtypes.h<br>
+++ b/src/mesa/main/mtypes.h<br>
@@ -5105,11 +5105,9 @@ struct gl_memory_info<br>
#ifdef DEBUG<br>
extern int MESA_VERBOSE;<br>
extern int MESA_DEBUG_FLAGS;<br>
-# define MESA_FUNCTION __func__<br>
#else<br>
# define MESA_VERBOSE 0<br>
# define MESA_DEBUG_FLAGS 0<br>
-# define MESA_FUNCTION "a function"<br>
#endif<br>
<br>
<br>
-- <br>
2.7.4<br>
<br>
</div>
</span></font></div>
</body>
</html>