projects / packages / Mesa.git / blame
| Commit | Line | Data |
|---|---|---|
| 0826bfd3 JB |
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 | |
| 3 | @@ -47,7 +47,7 @@ | |
| 4 | ||
| 5 | uint indentation; | |
| 6 | ||
| 7 | - void (*printf)(struct dump_ctx *ctx, const char *format, ...); | |
| 8 | + void (*dump_printf)(struct dump_ctx *ctx, const char *format, ...); | |
| 9 | }; | |
| 10 | ||
| 11 | static void | |
| 12 | @@ -68,19 +68,19 @@ | |
| 13 | uint enum_count ) | |
| 14 | { | |
| 15 | if (e >= enum_count) | |
| 16 | - ctx->printf( ctx, "%u", e ); | |
| 17 | + ctx->dump_printf( ctx, "%u", e ); | |
| 18 | else | |
| 19 | - ctx->printf( ctx, "%s", enums[e] ); | |
| 20 | + ctx->dump_printf( ctx, "%s", enums[e] ); | |
| 21 | } | |
| 22 | ||
| 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 ) ) | |
| 40 | ||
| 41 | static const char *processor_type_names[] = | |
| 42 | @@ -278,7 +278,7 @@ | |
| 43 | { | |
| 44 | struct dump_ctx ctx; | |
| 45 | ||
| 46 | - ctx.printf = dump_ctx_printf; | |
| 47 | + ctx.dump_printf = dump_ctx_printf; | |
| 48 | ||
| 49 | iter_declaration( &ctx.iter, (struct tgsi_full_declaration *)decl ); | |
| 50 | } | |
| 51 | @@ -323,7 +323,7 @@ | |
| 52 | { | |
| 53 | struct dump_ctx ctx; | |
| 54 | ||
| 55 | - ctx.printf = dump_ctx_printf; | |
| 56 | + ctx.dump_printf = dump_ctx_printf; | |
| 57 | ||
| 58 | iter_immediate( &ctx.iter, (struct tgsi_full_immediate *)imm ); | |
| 59 | } | |
| 60 | @@ -491,7 +491,7 @@ | |
| 61 | ||
| 62 | ctx.instno = instno; | |
| 63 | ctx.indent = 0; | |
| 64 | - ctx.printf = dump_ctx_printf; | |
| 65 | + ctx.dump_printf = dump_ctx_printf; | |
| 66 | ctx.indentation = 0; | |
| 67 | ||
| 68 | iter_instruction( &ctx.iter, (struct tgsi_full_instruction *)inst ); | |
| 69 | @@ -525,7 +525,7 @@ | |
| 70 | ||
| 71 | ctx.instno = 0; | |
| 72 | ctx.indent = 0; | |
| 73 | - ctx.printf = dump_ctx_printf; | |
| 74 | + ctx.dump_printf = dump_ctx_printf; | |
| 75 | ctx.indentation = 0; | |
| 76 | ||
| 77 | tgsi_iterate_shader( tokens, &ctx.iter ); | |
| 78 | @@ -579,7 +579,7 @@ | |
| 79 | ||
| 80 | ctx.base.instno = 0; | |
| 81 | ctx.base.indent = 0; | |
| 82 | - ctx.base.printf = &str_dump_ctx_printf; | |
| 83 | + ctx.base.dump_printf = &str_dump_ctx_printf; | |
| 84 | ctx.base.indentation = 0; | |
| 85 | ||
| 86 | ctx.str = str; |