+++ /dev/null
---- mesa/src/gallium/auxiliary/tgsi/tgsi_dump.c.org 2010-02-22 22:04:55.733686714 +0100
-+++ mesa/src/gallium/auxiliary/tgsi/tgsi_dump.c 2010-02-22 22:05:07.487007669 +0100
-@@ -47,16 +47,16 @@
-
- uint indentation;
-
-- void (*printf)(struct dump_ctx *ctx, const char *format, ...);
-+ void (*dump_printf)(struct dump_ctx *ctx, const char *format, ...);
- };
-
- static void
--dump_ctx_printf(struct dump_ctx *ctx, const char *format, ...)
-+dump_ctx_dump_printf(struct dump_ctx *ctx, const char *format, ...)
- {
- va_list ap;
- (void)ctx;
- va_start(ap, format);
-- debug_vprintf(format, ap);
-+ debug_vdump_printf(format, ap);
- va_end(ap);
- }
-
-@@ -68,19 +68,19 @@
- uint enum_count )
- {
- if (e >= enum_count)
-- ctx->printf( ctx, "%u", e );
-+ ctx->dump_printf( ctx, "%u", e );
- else
-- ctx->printf( ctx, "%s", enums[e] );
-+ ctx->dump_printf( ctx, "%s", enums[e] );
- }
-
--#define EOL() ctx->printf( ctx, "\n" )
--#define TXT(S) ctx->printf( ctx, "%s", S )
--#define CHR(C) ctx->printf( ctx, "%c", C )
--#define UIX(I) ctx->printf( ctx, "0x%x", I )
--#define UID(I) ctx->printf( ctx, "%u", I )
--#define INSTID(I) ctx->printf( ctx, "% 3u", I )
--#define SID(I) ctx->printf( ctx, "%d", I )
--#define FLT(F) ctx->printf( ctx, "%10.4f", F )
-+#define EOL() ctx->dump_printf( ctx, "\n" )
-+#define TXT(S) ctx->dump_printf( ctx, "%s", S )
-+#define CHR(C) ctx->dump_printf( ctx, "%c", C )
-+#define UIX(I) ctx->dump_printf( ctx, "0x%x", I )
-+#define UID(I) ctx->dump_printf( ctx, "%u", I )
-+#define INSTID(I) ctx->dump_printf( ctx, "% 3u", I )
-+#define SID(I) ctx->dump_printf( ctx, "%d", I )
-+#define FLT(F) ctx->dump_printf( ctx, "%10.4f", F )
- #define ENM(E,ENUMS) dump_enum( ctx, E, ENUMS, sizeof( ENUMS ) / sizeof( *ENUMS ) )
-
- static const char *processor_type_names[] =
-@@ -369,7 +369,7 @@
- {
- struct dump_ctx ctx;
-
-- ctx.printf = dump_ctx_printf;
-+ ctx.dump_printf = dump_ctx_dump_printf;
-
- iter_declaration( &ctx.iter, (struct tgsi_full_declaration *)decl );
- }
-@@ -419,7 +419,7 @@
- {
- struct dump_ctx ctx;
-
-- ctx.printf = dump_ctx_printf;
-+ ctx.dump_printf = dump_ctx_dump_printf;
-
- iter_property( &ctx.iter, (struct tgsi_full_property *)prop );
- }
-@@ -470,7 +470,7 @@
- {
- struct dump_ctx ctx;
-
-- ctx.printf = dump_ctx_printf;
-+ ctx.dump_printf = dump_ctx_dump_printf;
-
- iter_immediate( &ctx.iter, (struct tgsi_full_immediate *)imm );
- }
-@@ -605,7 +605,7 @@
-
- ctx.instno = instno;
- ctx.indent = 0;
-- ctx.printf = dump_ctx_printf;
-+ ctx.dump_printf = dump_ctx_dump_printf;
- ctx.indentation = 0;
-
- iter_instruction( &ctx.iter, (struct tgsi_full_instruction *)inst );
-@@ -637,7 +637,7 @@
-
- ctx.instno = 0;
- ctx.indent = 0;
-- ctx.printf = dump_ctx_printf;
-+ ctx.dump_printf = dump_ctx_dump_printf;
- ctx.indentation = 0;
-
- tgsi_iterate_shader( tokens, &ctx.iter );
-@@ -652,7 +652,7 @@
- };
-
- static void
--str_dump_ctx_printf(struct dump_ctx *ctx, const char *format, ...)
-+str_dump_ctx_dump_printf(struct dump_ctx *ctx, const char *format, ...)
- {
- struct str_dump_ctx *sctx = (struct str_dump_ctx *)ctx;
-
-@@ -660,11 +660,11 @@
- int written;
- va_list ap;
- va_start(ap, format);
-- written = util_vsnprintf(sctx->ptr, sctx->left, format, ap);
-+ written = util_vsndump_printf(sctx->ptr, sctx->left, format, ap);
- va_end(ap);
-
- /* Some complicated logic needed to handle the return value of
-- * vsnprintf:
-+ * vsndump_printf:
- */
- if (written > 0) {
- written = MIN2(sctx->left, written);
-@@ -692,7 +692,7 @@
-
- ctx.base.instno = 0;
- ctx.base.indent = 0;
-- ctx.base.printf = &str_dump_ctx_printf;
-+ ctx.base.dump_printf = &str_dump_ctx_dump_printf;
- ctx.base.indentation = 0;
-
- ctx.str = str;