Consistently just use C99's __func__ everywhere.
The patch was verified with Microsoft Visual studio 2013
redistributable package(RTM version number: 18.0.21005.1)
Next MSVC versions intends to support __func__.
No functional changes.
Signed-off-by: Marius Predut marius.pre...@intel.com
---
src/mesa/drivers/dri/common/utils.c|2 +-
src/mesa/drivers/dri/i965/brw_blorp.cpp|2 +-
src/mesa/drivers/dri/i965/brw_blorp_blit.cpp |2 +-
src/mesa/drivers/dri/i965/brw_context.c|4 +--
src/mesa/drivers/dri/i965/brw_draw_upload.c|2 +-
src/mesa/drivers/dri/i965/brw_state_cache.c|4 +--
src/mesa/drivers/dri/i965/brw_tex_layout.c |2 +-
src/mesa/drivers/dri/i965/brw_wm_surface_state.c |2 +-
src/mesa/drivers/dri/i965/gen6_surface_state.c |2 +-
src/mesa/drivers/dri/i965/gen7_wm_surface_state.c |2 +-
src/mesa/drivers/dri/i965/gen8_surface_state.c |2 +-
src/mesa/drivers/dri/i965/intel_blit.c |8 +++---
src/mesa/drivers/dri/i965/intel_fbo.c |8 +++---
src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 30 ++--
src/mesa/drivers/dri/i965/intel_pixel_bitmap.c |2 +-
src/mesa/drivers/dri/i965/intel_pixel_copy.c |6 ++--
src/mesa/drivers/dri/i965/intel_pixel_draw.c | 14 -
src/mesa/drivers/dri/i965/intel_pixel_read.c |8 +++---
src/mesa/drivers/dri/i965/intel_screen.c |4 +--
src/mesa/drivers/dri/i965/intel_tex.c | 10 +++
src/mesa/drivers/dri/i965/intel_tex_copy.c |4 +--
src/mesa/drivers/dri/i965/intel_tex_image.c| 16 +--
src/mesa/drivers/dri/i965/intel_tex_subimage.c |6 ++--
.../dri/i965/test_vec4_register_coalesce.cpp |2 +-
24 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/src/mesa/drivers/dri/common/utils.c
b/src/mesa/drivers/dri/common/utils.c
index bb22107..70d34e8 100644
--- a/src/mesa/drivers/dri/common/utils.c
+++ b/src/mesa/drivers/dri/common/utils.c
@@ -227,7 +227,7 @@ driCreateConfigs(mesa_format format,
break;
default:
fprintf(stderr, [%s:%u] Unknown framebuffer type %s (%d).\n,
- __FUNCTION__, __LINE__,
+ __func__, __LINE__,
_mesa_get_format_name(format), format);
return NULL;
}
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.cpp
b/src/mesa/drivers/dri/i965/brw_blorp.cpp
index df00b77..3b03f75 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp.cpp
@@ -194,7 +194,7 @@ intel_hiz_exec(struct brw_context *brw, struct
intel_mipmap_tree *mt,
}
DBG(%s %s to mt %p level %d layer %d\n,
- __FUNCTION__, opname, mt, level, layer);
+ __func__, opname, mt, level, layer);
if (brw-gen = 8) {
gen8_hiz_exec(brw, mt, level, layer, op);
diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
index 644cb41..d25e201 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
@@ -78,7 +78,7 @@ brw_blorp_blit_miptrees(struct brw_context *brw,
DBG(%s from %dx %s mt %p %d %d (%f,%f) (%f,%f)
to %dx %s mt %p %d %d (%f,%f) (%f,%f) (flip %d,%d)\n,
- __FUNCTION__,
+ __func__,
src_mt-num_samples, _mesa_get_format_name(src_mt-format), src_mt,
src_level, src_layer, src_x0, src_y0, src_x1, src_y1,
dst_mt-num_samples, _mesa_get_format_name(dst_mt-format), dst_mt,
diff --git a/src/mesa/drivers/dri/i965/brw_context.c
b/src/mesa/drivers/dri/i965/brw_context.c
index ed6fdff..a63d00b 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -722,7 +722,7 @@ brwCreateContext(gl_api api,
struct brw_context *brw = rzalloc(NULL, struct brw_context);
if (!brw) {
- fprintf(stderr, %s: failed to alloc context\n, __FUNCTION__);
+ fprintf(stderr, %s: failed to alloc context\n, __func__);
*dri_ctx_error = __DRI_CTX_ERROR_NO_MEMORY;
return false;
}
@@ -778,7 +778,7 @@ brwCreateContext(gl_api api,
if (!_mesa_initialize_context(ctx, api, mesaVis, shareCtx, functions)) {
*dri_ctx_error = __DRI_CTX_ERROR_NO_MEMORY;
- fprintf(stderr, %s: failed to init mesa context\n, __FUNCTION__);
+ fprintf(stderr, %s: failed to init mesa context\n, __func__);
intelDestroyContext(driContextPriv);
return false;
}
diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c
b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index 52dcb6f..623465f 100644
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -413,7 +413,7 @@ brw_prepare_vertices(struct brw_context *brw)
}
if (0)
- fprintf(stderr, %s %d..%d\n, __FUNCTION__, min_index, max_index);
+ fprintf(stderr, %s %d..%d\n, __func__,
