Signed-off-by: Eric Engestrom <eric.engest...@intel.com>
---
src/gallium/auxiliary/postprocess/pp_mlaa.c | 2 +-
src/gallium/auxiliary/util/u_debug_describe.c | 22 +++++++++----------
.../drivers/freedreno/freedreno_batch.c | 2 +-
src/gallium/drivers/svga/svga_msg.c | 2 +-
src/gallium/drivers/svga/svga_sampler_view.c | 2 +-
src/gallium/drivers/vc4/vc4_bufmgr.c | 2 +-
src/util/u_string.h | 2 +-
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/gallium/auxiliary/postprocess/pp_mlaa.c
b/src/gallium/auxiliary/postprocess/pp_mlaa.c
index fd5a55dde0a1338a9b1a..e3ce5eaf015b322f83ed 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 4bcd5624af400b2bc97a..6a191b3414935faa90c2 100644
--- a/src/gallium/auxiliary/util/u_debug_describe.c
+++ b/src/gallium/auxiliary/util/u_debug_describe.c
@@ -41,25 +41,25 @@ 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;
default:
- util_sprintf(buf, "pipe_martian_resource<%u>", ptr->target);
+ sprintf(buf, "pipe_martian_resource<%u>", ptr->target);
break;
}
}
@@ -69,7 +69,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
@@ -77,7 +77,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
@@ -85,7 +85,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));
}
@@ -95,6 +95,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 2c5673f34409203c00bc..14e3532685889b3b341e 100644
--- a/src/gallium/drivers/freedreno/freedreno_batch.c
+++ b/src/gallium/drivers/freedreno/freedreno_batch.c
@@ -256,7 +256,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_msg.c
b/src/gallium/drivers/svga/svga_msg.c
index 8b63132cb575bb45bfad..691b3f467901b10fb775 100755
--- a/src/gallium/drivers/svga/svga_msg.c
+++ b/src/gallium/drivers/svga/svga_msg.c
@@ -434,7 +434,7 @@ svga_host_log(const char *log)
return PIPE_ERROR_OUT_OF_MEMORY;
}
- util_sprintf(msg, "log %s", log);
+ sprintf(msg, "log %s", log);
if (svga_open_channel(&channel, RPCI_PROTOCOL_NUM) ||
svga_send_msg(&channel, msg) ||
diff --git a/src/gallium/drivers/svga/svga_sampler_view.c
b/src/gallium/drivers/svga/svga_sampler_view.c
index 26405cd1564e1250c804..8689897ae7abc3b4fced 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 716ca50ea0696ef2f340..cc32862d3fe58b4f3f53 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/util/u_string.h b/src/util/u_string.h
index 5039f4ba02569f867f81..a65867ad5fa0121ec54f 100644
--- a/src/util/u_string.h
+++ b/src/util/u_string.h
@@ -100,6 +100,7 @@ util_vsprintf(char *str, const char *format, va_list ap)
util_vsnprintf(str, (size_t)-1, format, ap);
}
+#define sprintf util_sprintf
static inline void
PRINTFLIKE(2, 3)
util_sprintf(char *str, const char *format, ...)
@@ -214,7 +215,6 @@ util_strstr(const char *haystack, const char *needle)
#define util_snprintf snprintf
#define util_vsprintf vsprintf
#define util_vasprintf vasprintf
-#define util_sprintf sprintf
#endif
--
Cheers,
Eric
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
