progs/rbug: Use util_format_name().

diff --git a/progs/rbug/bin_to_bmp.c b/progs/rbug/bin_to_bmp.c
index 18dd57b03493c1ac97e901ef606e08a607c4a023..6e9b162a6f722f780d04b0e3b69d54e41d3524b0 100644 (file)
--- 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 963f8eeedea684bfa4ba8666e6fe0207c4e7412e..e99f5a72b6affdff75bb37823bccbae1e5ca3c82 100644 (file)
--- 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 4a21bae35966b4b777548a5584f1d2817130eb04..60ed9e2149aaf20d0b955a9ae41a4143f2a40670 100644 (file)
--- 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);