r300: Use __FUNCTION__ not __func__.

Just for consistency; most of the code already uses __FUNCTION__.

diff --git a/src/mesa/drivers/dri/r300/r300_emit.h b/src/mesa/drivers/dri/r300/r300_emit.h
index 5e3efcfcf0b7ea89355d2253118ac80f1dbaa56a..7be098f743c66317f1ea18cc25ab8a20410ab2c4 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_emit.h
+++ b/src/mesa/drivers/dri/r300/r300_emit.h
@@ -134,7 +134,7 @@ static __inline__ uint32_t cmdpacify(void)
                cmd = (drm_radeon_cmd_header_t*)                        \
                        r300AllocCmdBuf(rmesa,                          \
                                        (_n+2),                         \
-                                       __func__);                      \
+                                       __FUNCTION__);                  \
                cmd_reserved=_n+2;                                      \
                cmd_written=1;                                          \
                cmd[0].i=cmdpacket0((reg), _n+1);                       \
@@ -169,7 +169,7 @@ static __inline__ uint32_t cmdpacify(void)
                cmd = (drm_radeon_cmd_header_t*)                        \
                        r300AllocCmdBuf(rmesa,                          \
                                        (_n+1),                         \
-                                       __func__);                      \
+                                       __FUNCTION__);                  \
                cmd_reserved = _n+2;                                    \
                cmd_written =1;                                         \
                cmd[0].i = cmdvpu((dest), _n/4);                        \
@@ -184,7 +184,7 @@ static __inline__ uint32_t cmdpacify(void)
                cmd = (drm_radeon_cmd_header_t*)                        \
                        r300AllocCmdBuf(rmesa,                          \
                                        (_n+3),                         \
-                                       __func__);                      \
+                                       __FUNCTION__);                  \
                cmd_reserved = _n+3;                                    \
                cmd_written = 2;                                        \
                if(_n > 0x3fff) {                                       \

diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c
index c6fbe3f9aaec63a8497969e9eb2cb4f2584eb8a1..cce8e685865f0b64c1fca00093df5ebab1fcbc01 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.c
@@ -57,7 +57,7 @@
  */
 #define ERROR(fmt, args...) do {                       \
                fprintf(stderr, "%s::%s(): " fmt "\n",  \
-                       __FILE__, __func__, ##args);    \
+                       __FILE__, __FUNCTION__, ##args);        \
                fp->error = GL_TRUE;                    \
        } while(0)
 

diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index 8a567d8afaa04f5dc6f1ef44d5d9915201515e18..d967c69c42749310358fa9e858f7481405082c8e 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -260,7 +260,7 @@ static void r300EmitAOS(r300ContextPtr rmesa, GLuint nr, GLuint offset)
        drm_radeon_cmd_header_t *cmd = NULL;
 
        if (RADEON_DEBUG & DEBUG_VERTS)
-               fprintf(stderr, "%s: nr=%d, ofs=0x%08x\n", __func__, nr,
+               fprintf(stderr, "%s: nr=%d, ofs=0x%08x\n", __FUNCTION__, nr,
                        offset);
 
        start_packet3(RADEON_CP_PACKET3_3D_LOAD_VBPNTR, sz - 1);

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index f80ae0ca61570871cdde8bc316879d57c57f7dcb..4f25ff7e812a87f00c4c11cf6091b62f88a2f9a8 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -248,7 +248,7 @@ static void r300SetBlendState(GLcontext * ctx)
        default:
                fprintf(stderr,
                        "[%s:%u] Invalid RGB blend equation (0x%04x).\n",
-                       __func__, __LINE__, ctx->Color.BlendEquationRGB);
+                       __FUNCTION__, __LINE__, ctx->Color.BlendEquationRGB);
                return;
        }
 
@@ -286,7 +286,7 @@ static void r300SetBlendState(GLcontext * ctx)
        default:
                fprintf(stderr,
                        "[%s:%u] Invalid A blend equation (0x%04x).\n",
-                       __func__, __LINE__, ctx->Color.BlendEquationA);
+                       __FUNCTION__, __LINE__, ctx->Color.BlendEquationA);
                return;
        }
 
@@ -1919,7 +1919,7 @@ void r300SetupPixelShader(r300ContextPtr rmesa)
        r300TranslateFragmentShader(rmesa, fp);
        if (!fp->translated) {
                fprintf(stderr, "%s: No valid fragment shader, exiting\n",
-                       __func__);
+                       __FUNCTION__);
                return;
        }
 #define OUTPUT_FIELD(st, reg, field)  \