1 --- Mesa-7.7/src/gallium/auxiliary/tgsi/tgsi_dump.c.orig 2009-12-22 03:26:02.000000000 +0100
2 +++ Mesa-7.7/src/gallium/auxiliary/tgsi/tgsi_dump.c 2010-01-10 09:40:23.298610151 +0100
7 - void (*printf)(struct dump_ctx *ctx, const char *format, ...);
8 + void (*dump_printf)(struct dump_ctx *ctx, const char *format, ...);
16 - ctx->printf( ctx, "%u", e );
17 + ctx->dump_printf( ctx, "%u", e );
19 - ctx->printf( ctx, "%s", enums[e] );
20 + ctx->dump_printf( ctx, "%s", enums[e] );
23 -#define EOL() ctx->printf( ctx, "\n" )
24 -#define TXT(S) ctx->printf( ctx, "%s", S )
25 -#define CHR(C) ctx->printf( ctx, "%c", C )
26 -#define UIX(I) ctx->printf( ctx, "0x%x", I )
27 -#define UID(I) ctx->printf( ctx, "%u", I )
28 -#define INSTID(I) ctx->printf( ctx, "% 3u", I )
29 -#define SID(I) ctx->printf( ctx, "%d", I )
30 -#define FLT(F) ctx->printf( ctx, "%10.4f", F )
31 +#define EOL() ctx->dump_printf( ctx, "\n" )
32 +#define TXT(S) ctx->dump_printf( ctx, "%s", S )
33 +#define CHR(C) ctx->dump_printf( ctx, "%c", C )
34 +#define UIX(I) ctx->dump_printf( ctx, "0x%x", I )
35 +#define UID(I) ctx->dump_printf( ctx, "%u", I )
36 +#define INSTID(I) ctx->dump_printf( ctx, "% 3u", I )
37 +#define SID(I) ctx->dump_printf( ctx, "%d", I )
38 +#define FLT(F) ctx->dump_printf( ctx, "%10.4f", F )
39 #define ENM(E,ENUMS) dump_enum( ctx, E, ENUMS, sizeof( ENUMS ) / sizeof( *ENUMS ) )
41 static const char *processor_type_names[] =
46 - ctx.printf = dump_ctx_printf;
47 + ctx.dump_printf = dump_ctx_printf;
49 iter_declaration( &ctx.iter, (struct tgsi_full_declaration *)decl );
55 - ctx.printf = dump_ctx_printf;
56 + ctx.dump_printf = dump_ctx_printf;
58 iter_immediate( &ctx.iter, (struct tgsi_full_immediate *)imm );
64 - ctx.printf = dump_ctx_printf;
65 + ctx.dump_printf = dump_ctx_printf;
68 iter_instruction( &ctx.iter, (struct tgsi_full_instruction *)inst );
73 - ctx.printf = dump_ctx_printf;
74 + ctx.dump_printf = dump_ctx_printf;
77 tgsi_iterate_shader( tokens, &ctx.iter );
82 - ctx.base.printf = &str_dump_ctx_printf;
83 + ctx.base.dump_printf = &str_dump_ctx_printf;
84 ctx.base.indentation = 0;