diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/auxiliary/postprocess/pp_mlaa.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_debug_describe.c | 28 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/freedreno_batch.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_sampler_view.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_bufmgr.c | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/svga/drm/vmw_msg.c | 2 | ||||
| -rw-r--r-- | src/util/u_string.h | 2 |
7 files changed, 20 insertions, 20 deletions
diff --git a/src/gallium/auxiliary/postprocess/pp_mlaa.c b/src/gallium/auxiliary/postprocess/pp_mlaa.c index fd5a55dde0a..e3ce5eaf015 100644 --- a/src/gallium/auxiliary/postprocess/pp_mlaa.c +++ b/src/gallium/auxiliary/postprocess/pp_mlaa.c @@ -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); diff --git a/src/gallium/auxiliary/util/u_debug_describe.c b/src/gallium/auxiliary/util/u_debug_describe.c index 621cdbebac2..b78c99dd45a 100644 --- a/src/gallium/auxiliary/util/u_debug_describe.c +++ b/src/gallium/auxiliary/util/u_debug_describe.c @@ -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); } diff --git a/src/gallium/drivers/freedreno/freedreno_batch.c b/src/gallium/drivers/freedreno/freedreno_batch.c index a41e89f1090..61b5496efa5 100644 --- a/src/gallium/drivers/freedreno/freedreno_batch.c +++ b/src/gallium/drivers/freedreno/freedreno_batch.c @@ -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 diff --git a/src/gallium/drivers/svga/svga_sampler_view.c b/src/gallium/drivers/svga/svga_sampler_view.c index 26405cd1564..8689897ae7a 100644 --- a/src/gallium/drivers/svga/svga_sampler_view.c +++ b/src/gallium/drivers/svga/svga_sampler_view.c @@ -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); } diff --git a/src/gallium/drivers/vc4/vc4_bufmgr.c b/src/gallium/drivers/vc4/vc4_bufmgr.c index 716ca50ea06..cc32862d3fe 100644 --- a/src/gallium/drivers/vc4/vc4_bufmgr.c +++ b/src/gallium/drivers/vc4/vc4_bufmgr.c @@ -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); } diff --git a/src/gallium/winsys/svga/drm/vmw_msg.c b/src/gallium/winsys/svga/drm/vmw_msg.c index 3e8ed2a0fb5..2a2d6a61297 100644 --- a/src/gallium/winsys/svga/drm/vmw_msg.c +++ b/src/gallium/winsys/svga/drm/vmw_msg.c @@ -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); diff --git a/src/util/u_string.h b/src/util/u_string.h index fe0f857218f..d91293c3380 100644 --- a/src/util/u_string.h +++ b/src/util/u_string.h @@ -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 |