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

util: use standard name for sprintf()

Browse Source 
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Eric Engestrom
2018-11-20 11:55:00 +00:00
parent 321d971b08
commit 59c2dd1b8c
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/auxiliary/postprocess/pp_mlaa.c
View File

@@ -229,7 +229,7 @@ pp_jimenezmlaa_init_run(struct pp_queue_t *ppq, unsigned int n,
pp_debug("mlaa: using %u max search steps\n", val);
util_sprintf(tmp_text, "%s"
sprintf(tmp_text, "%s"
"IMM FLT32 { %.8f, 0.0000, 0.0000, 0.0000}\n"
"%s\n", blend2fs_1, (float) val, blend2fs_2);

28
src/gallium/auxiliary/util/u_debug_describe.c
View File

@@ -41,34 +41,34 @@ debug_describe_resource(char* buf, const struct pipe_resource *ptr)
switch(ptr->target)
{
case PIPE_BUFFER:
util_sprintf(buf, "pipe_buffer<%u>", (unsigned)util_format_get_stride(ptr->format, ptr->width0));
sprintf(buf, "pipe_buffer<%u>", (unsigned)util_format_get_stride(ptr->format, ptr->width0));
break;
case PIPE_TEXTURE_1D:
util_sprintf(buf, "pipe_texture1d<%u,%s,%u>", ptr->width0, util_format_short_name(ptr->format), ptr->last_level);
sprintf(buf, "pipe_texture1d<%u,%s,%u>", ptr->width0, util_format_short_name(ptr->format), ptr->last_level);
break;
case PIPE_TEXTURE_2D:
util_sprintf(buf, "pipe_texture2d<%u,%u,%s,%u>", ptr->width0, ptr->height0, util_format_short_name(ptr->format), ptr->last_level);
sprintf(buf, "pipe_texture2d<%u,%u,%s,%u>", ptr->width0, ptr->height0, util_format_short_name(ptr->format), ptr->last_level);
break;
case PIPE_TEXTURE_RECT:
util_sprintf(buf, "pipe_texture_rect<%u,%u,%s>", ptr->width0, ptr->height0, util_format_short_name(ptr->format));
sprintf(buf, "pipe_texture_rect<%u,%u,%s>", ptr->width0, ptr->height0, util_format_short_name(ptr->format));
break;
case PIPE_TEXTURE_CUBE:
util_sprintf(buf, "pipe_texture_cube<%u,%u,%s,%u>", ptr->width0, ptr->height0, util_format_short_name(ptr->format), ptr->last_level);
sprintf(buf, "pipe_texture_cube<%u,%u,%s,%u>", ptr->width0, ptr->height0, util_format_short_name(ptr->format), ptr->last_level);
break;
case PIPE_TEXTURE_3D:
util_sprintf(buf, "pipe_texture3d<%u,%u,%u,%s,%u>", ptr->width0, ptr->height0, ptr->depth0, util_format_short_name(ptr->format), ptr->last_level);
sprintf(buf, "pipe_texture3d<%u,%u,%u,%s,%u>", ptr->width0, ptr->height0, ptr->depth0, util_format_short_name(ptr->format), ptr->last_level);
break;
case PIPE_TEXTURE_1D_ARRAY:
util_sprintf(buf, "pipe_texture_1darray<%u,%u,%s,%u>", ptr->width0, ptr->array_size, util_format_short_name(ptr->format), ptr->last_level);
sprintf(buf, "pipe_texture_1darray<%u,%u,%s,%u>", ptr->width0, ptr->array_size, util_format_short_name(ptr->format), ptr->last_level);
break;
case PIPE_TEXTURE_2D_ARRAY:
util_sprintf(buf, "pipe_texture_2darray<%u,%u,%u,%s,%u>", ptr->width0, ptr->height0, ptr->array_size, util_format_short_name(ptr->format), ptr->last_level);
sprintf(buf, "pipe_texture_2darray<%u,%u,%u,%s,%u>", ptr->width0, ptr->height0, ptr->array_size, util_format_short_name(ptr->format), ptr->last_level);
break;
case PIPE_TEXTURE_CUBE_ARRAY:
util_sprintf(buf, "pipe_texture_cubearray<%u,%u,%u,%s,%u>", ptr->width0, ptr->height0, ptr->array_size, util_format_short_name(ptr->format), ptr->last_level);
sprintf(buf, "pipe_texture_cubearray<%u,%u,%u,%s,%u>", ptr->width0, ptr->height0, ptr->array_size, util_format_short_name(ptr->format), ptr->last_level);
break;
default:
util_sprintf(buf, "pipe_martian_resource<%u>", ptr->target);
sprintf(buf, "pipe_martian_resource<%u>", ptr->target);
break;
}
}
@@ -78,7 +78,7 @@ debug_describe_surface(char* buf, const struct pipe_surface *ptr)
{
char res[128];
debug_describe_resource(res, ptr->texture);
util_sprintf(buf, "pipe_surface<%s,%u,%u,%u>", res, ptr->u.tex.level, ptr->u.tex.first_layer, ptr->u.tex.last_layer);
sprintf(buf, "pipe_surface<%s,%u,%u,%u>", res, ptr->u.tex.level, ptr->u.tex.first_layer, ptr->u.tex.last_layer);
}
void
@@ -86,7 +86,7 @@ debug_describe_sampler_view(char* buf, const struct pipe_sampler_view *ptr)
{
char res[128];
debug_describe_resource(res, ptr->texture);
util_sprintf(buf, "pipe_sampler_view<%s,%s>", res, util_format_short_name(ptr->format));
sprintf(buf, "pipe_sampler_view<%s,%s>", res, util_format_short_name(ptr->format));
}
void
@@ -94,7 +94,7 @@ debug_describe_image_view(char* buf, const struct pipe_image_view *ptr)
{
char res[128];
debug_describe_resource(res, ptr->resource);
util_sprintf(buf, "pipe_image_view<%s,%s>", res,
sprintf(buf, "pipe_image_view<%s,%s>", res,
util_format_short_name(ptr->format));
}
@@ -104,6 +104,6 @@ debug_describe_so_target(char* buf,
{
char res[128];
debug_describe_resource(res, ptr->buffer);
util_sprintf(buf, "pipe_stream_output_target<%s,%u,%u>", res,
sprintf(buf, "pipe_stream_output_target<%s,%u,%u>", res,
ptr->buffer_offset, ptr->buffer_size);
}

2
src/gallium/drivers/freedreno/freedreno_batch.c
View File

@@ -277,7 +277,7 @@ __fd_batch_destroy(struct fd_batch *batch)
void
__fd_batch_describe(char* buf, const struct fd_batch *batch)
{
util_sprintf(buf, "fd_batch<%u>", batch->seqno);
sprintf(buf, "fd_batch<%u>", batch->seqno);
}
void

2
src/gallium/drivers/svga/svga_sampler_view.c
View File

@@ -48,7 +48,7 @@ svga_debug_describe_sampler_view(char *buf, const struct svga_sampler_view *sv)
{
char res[128];
debug_describe_resource(res, sv->texture);
util_sprintf(buf, "svga_sampler_view<%s,[%u,%u]>",
sprintf(buf, "svga_sampler_view<%s,[%u,%u]>",
res, sv->min_lod, sv->max_lod);
}

2
src/gallium/drivers/vc4/vc4_bufmgr.c
View File

@@ -52,7 +52,7 @@ vc4_bo_cache_free_all(struct vc4_bo_cache *cache);
void
vc4_bo_debug_describe(char* buf, const struct vc4_bo *ptr)
{
util_sprintf(buf, "vc4_bo<%s,%u,%u>", ptr->name ? ptr->name : "?",
sprintf(buf, "vc4_bo<%s,%u,%u>", ptr->name ? ptr->name : "?",
ptr->handle, ptr->size);
}

2
src/gallium/winsys/svga/drm/vmw_msg.c
View File

@@ -442,7 +442,7 @@ vmw_svga_winsys_host_log(struct svga_winsys_screen *sws, const char *log)
return;
}
util_sprintf(msg, "log %s", log);
sprintf(msg, "log %s", log);
if (!(ret = vmw_open_channel(&channel, RPCI_PROTOCOL_NUM))) {
ret = vmw_send_msg(&channel, msg);

2
src/util/u_string.h
View File

@@ -94,6 +94,7 @@ util_snprintf(char *str, size_t size, const char *format, ...)
return ret;
}
#define sprintf util_sprintf
static inline void
PRINTFLIKE(2, 3)
util_sprintf(char *str, const char *format, ...)
@@ -184,7 +185,6 @@ util_strncmp(const char *s1, const char *s2, size_t n)
#define util_vsnprintf vsnprintf
#define util_snprintf snprintf
#define util_vasprintf vasprintf
#define util_sprintf sprintf
#endif