OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

state_tracker: replace __FUNCTION__ with __func__

Browse Source 
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.

Acked-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Marius Predut <marius.predut@intel.com>
This commit is contained in:
Marius Predut
2015-04-07 22:04:38 +03:00
committed by Matt Turner
parent d02942cc77
commit 50cb780f7f
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/state_tracker/st_atom.c
View File

@@ -183,7 +183,7 @@ void st_validate_state( struct st_context *st )
if (state->st == 0) if (state->st == 0)
return; return;
/*printf("%s %x/%x\n", __FUNCTION__, state->mesa, state->st);*/ /*printf("%s %x/%x\n", __func__, state->mesa, state->st);*/
#ifdef DEBUG #ifdef DEBUG
if (1) { if (1) {

2
src/mesa/state_tracker/st_atom_constbuf.c
View File

@@ -92,7 +92,7 @@ void st_upload_constants( struct st_context *st,
if (ST_DEBUG & DEBUG_CONSTANTS) { if (ST_DEBUG & DEBUG_CONSTANTS) {
debug_printf("%s(shader=%d, numParams=%d, stateFlags=0x%x)\n", debug_printf("%s(shader=%d, numParams=%d, stateFlags=0x%x)\n",
__FUNCTION__, shader_type, params->NumParameters, __func__, shader_type, params->NumParameters,
params->StateFlags); params->StateFlags);
_mesa_print_parameter_list(params); _mesa_print_parameter_list(params);
} }

2
src/mesa/state_tracker/st_cb_clear.c
View File

@@ -247,7 +247,7 @@ clear_with_quad(struct gl_context *ctx, unsigned clear_buffers)
util_framebuffer_get_num_layers(&st->state.framebuffer); util_framebuffer_get_num_layers(&st->state.framebuffer);
/* /*
printf("%s %s%s%s %f,%f %f,%f\n", __FUNCTION__, printf("%s %s%s%s %f,%f %f,%f\n", __func__,
color ? "color, " : "", color ? "color, " : "",
depth ? "depth, " : "", depth ? "depth, " : "",
stencil ? "stencil" : "", stencil ? "stencil" : "",

18
src/mesa/state_tracker/st_cb_texture.c
View File

@@ -123,7 +123,7 @@ gl_target_to_pipe(GLenum target)
static struct gl_texture_image * static struct gl_texture_image *
st_NewTextureImage(struct gl_context * ctx) st_NewTextureImage(struct gl_context * ctx)
{ {
DBG("%s\n", __FUNCTION__); DBG("%s\n", __func__);
(void) ctx; (void) ctx;
return (struct gl_texture_image *) ST_CALLOC_STRUCT(st_texture_image); return (struct gl_texture_image *) ST_CALLOC_STRUCT(st_texture_image);
} }
@@ -144,7 +144,7 @@ st_NewTextureObject(struct gl_context * ctx, GLuint name, GLenum target)
{ {
struct st_texture_object *obj = ST_CALLOC_STRUCT(st_texture_object); struct st_texture_object *obj = ST_CALLOC_STRUCT(st_texture_object);
DBG("%s\n", __FUNCTION__); DBG("%s\n", __func__);
_mesa_initialize_texture_object(ctx, &obj->base, name, target); _mesa_initialize_texture_object(ctx, &obj->base, name, target);
return &obj->base; return &obj->base;
@@ -172,7 +172,7 @@ st_FreeTextureImageBuffer(struct gl_context *ctx,
{ {
struct st_texture_image *stImage = st_texture_image(texImage); struct st_texture_image *stImage = st_texture_image(texImage);
DBG("%s\n", __FUNCTION__); DBG("%s\n", __func__);
if (stImage->pt) { if (stImage->pt) {
pipe_resource_reference(&stImage->pt, NULL); pipe_resource_reference(&stImage->pt, NULL);
@@ -405,7 +405,7 @@ guess_and_alloc_texture(struct st_context *st,
GLuint ptWidth, ptHeight, ptDepth, ptLayers; GLuint ptWidth, ptHeight, ptDepth, ptLayers;
enum pipe_format fmt; enum pipe_format fmt;
DBG("%s\n", __FUNCTION__); DBG("%s\n", __func__);
assert(!stObj->pt); assert(!stObj->pt);
@@ -473,7 +473,7 @@ guess_and_alloc_texture(struct st_context *st,
stObj->lastLevel = lastLevel; stObj->lastLevel = lastLevel;
DBG("%s returning %d\n", __FUNCTION__, (stObj->pt != NULL)); DBG("%s returning %d\n", __func__, (stObj->pt != NULL));
return stObj->pt != NULL; return stObj->pt != NULL;
} }
@@ -496,7 +496,7 @@ st_AllocTextureImageBuffer(struct gl_context *ctx,
GLuint height = texImage->Height; GLuint height = texImage->Height;
GLuint depth = texImage->Depth; GLuint depth = texImage->Depth;
DBG("%s\n", __FUNCTION__); DBG("%s\n", __func__);
assert(!stImage->pt); /* xxx this might be wrong */ assert(!stImage->pt); /* xxx this might be wrong */
@@ -1153,7 +1153,7 @@ st_GetTexImage(struct gl_context * ctx,
} }
if (ST_DEBUG & DEBUG_FALLBACK) if (ST_DEBUG & DEBUG_FALLBACK)
debug_printf("%s: fallback format translation\n", __FUNCTION__); debug_printf("%s: fallback format translation\n", __func__);
dstMesaFormat = _mesa_format_from_format_and_type(format, type); dstMesaFormat = _mesa_format_from_format_and_type(format, type);
dstStride = _mesa_image_row_stride(&ctx->Pack, width, format, type); dstStride = _mesa_image_row_stride(&ctx->Pack, width, format, type);
@@ -1239,7 +1239,7 @@ fallback_copy_texsubimage(struct gl_context *ctx,
struct pipe_transfer *transfer; struct pipe_transfer *transfer;
if (ST_DEBUG & DEBUG_FALLBACK) if (ST_DEBUG & DEBUG_FALLBACK)
debug_printf("%s: fallback processing\n", __FUNCTION__); debug_printf("%s: fallback processing\n", __func__);
if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) { if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) {
srcY = strb->Base.Height - srcY - height; srcY = strb->Base.Height - srcY - height;
@@ -1394,7 +1394,7 @@ st_CopyTexSubImage(struct gl_context *ctx, GLuint dims,
texImage->TexFormat != MESA_FORMAT_ETC1_RGB8); texImage->TexFormat != MESA_FORMAT_ETC1_RGB8);
if (!strb || !strb->surface || !stImage->pt) { if (!strb || !strb->surface || !stImage->pt) {
debug_printf("%s: null strb or stImage\n", __FUNCTION__); debug_printf("%s: null strb or stImage\n", __func__);
return; return;
} }

2
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
View File

@@ -5400,7 +5400,7 @@ out:
free(t->immediates); free(t->immediates);
if (t->error) { if (t->error) {
debug_printf("%s: translate error flag set\n", __FUNCTION__); debug_printf("%s: translate error flag set\n", __func__);
} }
free(t); free(t);

2
src/mesa/state_tracker/st_mesa_to_tgsi.c
View File

@@ -1249,7 +1249,7 @@ out:
free(t->constants); free(t->constants);
if (t->error) { if (t->error) {
debug_printf("%s: translate error flag set\n", __FUNCTION__); debug_printf("%s: translate error flag set\n", __func__);
} }
return ret; return ret;

2
src/mesa/state_tracker/st_program.c
View File

@@ -403,7 +403,7 @@ st_translate_vertex_program(struct st_context *st,
return vpv; return vpv;
fail: fail:
debug_printf("%s: failed to translate Mesa program:\n", __FUNCTION__); debug_printf("%s: failed to translate Mesa program:\n", __func__);
_mesa_print_program(&stvp->Base.Base); _mesa_print_program(&stvp->Base.Base);
debug_assert(0); debug_assert(0);

6
src/mesa/state_tracker/st_texture.c
View File

@@ -74,7 +74,7 @@ st_texture_create(struct st_context *st,
if (target == PIPE_TEXTURE_CUBE) if (target == PIPE_TEXTURE_CUBE)
assert(layers == 6); assert(layers == 6);
DBG("%s target %d format %s last_level %d\n", __FUNCTION__, DBG("%s target %d format %s last_level %d\n", __func__,
(int) target, util_format_name(format), last_level); (int) target, util_format_name(format), last_level);
assert(format); assert(format);
@@ -250,7 +250,7 @@ st_texture_image_map(struct st_context *st, struct st_texture_image *stImage,
GLuint level; GLuint level;
void *map; void *map;
DBG("%s \n", __FUNCTION__); DBG("%s \n", __func__);
if (!stImage->pt) if (!stImage->pt)
return NULL; return NULL;
@@ -304,7 +304,7 @@ st_texture_image_unmap(struct st_context *st,
slice += stObj->base.MinLayer; slice += stObj->base.MinLayer;
transfer = &stImage->transfer[slice + stImage->base.Face].transfer; transfer = &stImage->transfer[slice + stImage->base.Face].transfer;
DBG("%s\n", __FUNCTION__); DBG("%s\n", __func__);
pipe_transfer_unmap(pipe, *transfer); pipe_transfer_unmap(pipe, *transfer);
*transfer = NULL; *transfer = NULL;