From 8266f1e5a5a2f066e4dd0e7bf3273d6edcbff760 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Wed, 17 Feb 2010 22:55:16 -0800 Subject: progs/rbug: Use util_format_name(). --- progs/rbug/bin_to_bmp.c | 2 +- progs/rbug/tex_dump.c | 2 +- progs/rbug/tex_info.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'progs') diff --git a/progs/rbug/bin_to_bmp.c b/progs/rbug/bin_to_bmp.c index 18dd57b034..6e9b162a6f 100644 --- a/progs/rbug/bin_to_bmp.c +++ b/progs/rbug/bin_to_bmp.c @@ -74,7 +74,7 @@ static void dump(unsigned width, unsigned height, rgba = MALLOC(dst_size); } - util_snprintf(filename, 512, "%s.bmp", pf_name(src_format)); + util_snprintf(filename, 512, "%s.bmp", util_format_name(src_format)); if (util_format_is_compressed(src_format)) { debug_printf("skipping: %s\n", filename); diff --git a/progs/rbug/tex_dump.c b/progs/rbug/tex_dump.c index 963f8eeede..e99f5a72b6 100644 --- a/progs/rbug/tex_dump.c +++ b/progs/rbug/tex_dump.c @@ -48,7 +48,7 @@ static void dump(rbug_texture_t tex, char filename[512]; util_snprintf(filename, 512, "%llu_%s_%u.bmp", - (unsigned long long)tex, pf_name(info->format), mip); + (unsigned long long)tex, util_format_name(info->format), mip); if (util_format_is_compressed(info->format)) { debug_printf("skipping: %s\n", filename); diff --git a/progs/rbug/tex_info.c b/progs/rbug/tex_info.c index 4a21bae359..60ed9e2149 100644 --- a/progs/rbug/tex_info.c +++ b/progs/rbug/tex_info.c @@ -24,6 +24,7 @@ #include "pipe/p_compiler.h" #include "pipe/p_format.h" +#include "util/u_format.h" #include "util/u_memory.h" #include "util/u_debug.h" #include "util/u_network.h" @@ -60,7 +61,7 @@ static void talk() info = (struct rbug_proto_texture_info_reply *)header; debug_printf("%llu %s %u x %u x %u, block(%ux%u %u), last_level: %u, nr_samples: %u, usage: %u\n", - (unsigned long long)list->textures[i], pf_name(info->format), + (unsigned long long)list->textures[i], util_format_name(info->format), info->width[0], info->height[0], info->depth[0], info->blockw, info->blockh, info->blocksize, info->last_level, info->nr_samples, info->tex_usage); -- cgit v1.2.3