1 --- mesa/src/gallium/auxiliary/tgsi/tgsi_dump.c.org 2010-02-22 22:04:55.733686714 +0100
2 +++ mesa/src/gallium/auxiliary/tgsi/tgsi_dump.c 2010-02-22 22:05:07.487007669 +0100
7 - void (*printf)(struct dump_ctx *ctx, const char *format, ...);
8 + void (*dump_printf)(struct dump_ctx *ctx, const char *format, ...);
12 -dump_ctx_printf(struct dump_ctx *ctx, const char *format, ...)
13 +dump_ctx_dump_printf(struct dump_ctx *ctx, const char *format, ...)
18 - debug_vprintf(format, ap);
19 + debug_vdump_printf(format, ap);
27 - ctx->printf( ctx, "%u", e );
28 + ctx->dump_printf( ctx, "%u", e );
30 - ctx->printf( ctx, "%s", enums[e] );
31 + ctx->dump_printf( ctx, "%s", enums[e] );
34 -#define EOL() ctx->printf( ctx, "\n" )
35 -#define TXT(S) ctx->printf( ctx, "%s", S )
36 -#define CHR(C) ctx->printf( ctx, "%c", C )
37 -#define UIX(I) ctx->printf( ctx, "0x%x", I )
38 -#define UID(I) ctx->printf( ctx, "%u", I )
39 -#define INSTID(I) ctx->printf( ctx, "% 3u", I )
40 -#define SID(I) ctx->printf( ctx, "%d", I )
41 -#define FLT(F) ctx->printf( ctx, "%10.4f", F )
42 +#define EOL() ctx->dump_printf( ctx, "\n" )
43 +#define TXT(S) ctx->dump_printf( ctx, "%s", S )
44 +#define CHR(C) ctx->dump_printf( ctx, "%c", C )
45 +#define UIX(I) ctx->dump_printf( ctx, "0x%x", I )
46 +#define UID(I) ctx->dump_printf( ctx, "%u", I )
47 +#define INSTID(I) ctx->dump_printf( ctx, "% 3u", I )
48 +#define SID(I) ctx->dump_printf( ctx, "%d", I )
49 +#define FLT(F) ctx->dump_printf( ctx, "%10.4f", F )
50 #define ENM(E,ENUMS) dump_enum( ctx, E, ENUMS, sizeof( ENUMS ) / sizeof( *ENUMS ) )
52 static const char *processor_type_names[] =
57 - ctx.printf = dump_ctx_printf;
58 + ctx.dump_printf = dump_ctx_dump_printf;
60 iter_declaration( &ctx.iter, (struct tgsi_full_declaration *)decl );
66 - ctx.printf = dump_ctx_printf;
67 + ctx.dump_printf = dump_ctx_dump_printf;
69 iter_property( &ctx.iter, (struct tgsi_full_property *)prop );
75 - ctx.printf = dump_ctx_printf;
76 + ctx.dump_printf = dump_ctx_dump_printf;
78 iter_immediate( &ctx.iter, (struct tgsi_full_immediate *)imm );
84 - ctx.printf = dump_ctx_printf;
85 + ctx.dump_printf = dump_ctx_dump_printf;
88 iter_instruction( &ctx.iter, (struct tgsi_full_instruction *)inst );
93 - ctx.printf = dump_ctx_printf;
94 + ctx.dump_printf = dump_ctx_dump_printf;
97 tgsi_iterate_shader( tokens, &ctx.iter );
102 -str_dump_ctx_printf(struct dump_ctx *ctx, const char *format, ...)
103 +str_dump_ctx_dump_printf(struct dump_ctx *ctx, const char *format, ...)
105 struct str_dump_ctx *sctx = (struct str_dump_ctx *)ctx;
107 @@ -660,11 +660,11 @@
110 va_start(ap, format);
111 - written = util_vsnprintf(sctx->ptr, sctx->left, format, ap);
112 + written = util_vsndump_printf(sctx->ptr, sctx->left, format, ap);
115 /* Some complicated logic needed to handle the return value of
120 written = MIN2(sctx->left, written);
125 - ctx.base.printf = &str_dump_ctx_printf;
126 + ctx.base.dump_printf = &str_dump_ctx_dump_printf;
127 ctx.base.indentation = 0;