diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-11-15 16:53:24 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-11-15 16:53:24 +0000 |
| commit | 7468765b18be202a64d58b83f6267b6973ea4897 (patch) | |
| tree | 6e9fa6dd4a2ff79787bcae247377d07c00a036cf /src/mesa/shader/prog_print.c | |
| parent | 5e1454a036be6da2c48e2e20bf6f8047ee1a94d3 (diff) | |
| parent | 80d6379722a1249ce13db79a898d340644936f67 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/shader/prog_print.c
Diffstat (limited to 'src/mesa/shader/prog_print.c')
| -rw-r--r-- | src/mesa/shader/prog_print.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c index 22b8f1de3c..db6eac4fd9 100644 --- a/src/mesa/shader/prog_print.c +++ b/src/mesa/shader/prog_print.c @@ -215,7 +215,7 @@ reg_string(enum register_file f, GLint index, gl_prog_print_mode mode, switch (mode) { case PROG_PRINT_DEBUG: if (relAddr) - sprintf(str, "%s[ADDR%s%d]", file_string(f, mode), (index > 0) ? "+" : "", index); + sprintf(str, "%s[ADDR+%d]", file_string(f, mode), index); else sprintf(str, "%s[%d]", file_string(f, mode), index); break; @@ -371,8 +371,8 @@ _mesa_print_swizzle(GLuint swizzle) } -static const char * -writemask_string(GLuint writeMask) +const char * +_mesa_writemask_string(GLuint writeMask) { static char s[10]; GLuint i = 0; @@ -420,7 +420,7 @@ print_dst_reg(const struct prog_dst_register *dstReg, gl_prog_print_mode mode, _mesa_printf("%s%s", reg_string((enum register_file) dstReg->File, dstReg->Index, mode, dstReg->RelAddr, prog), - writemask_string(dstReg->WriteMask)); + _mesa_writemask_string(dstReg->WriteMask)); if (dstReg->CondMask != COND_TR) { _mesa_printf(" (%s.%s)", @@ -432,7 +432,7 @@ print_dst_reg(const struct prog_dst_register *dstReg, gl_prog_print_mode mode, _mesa_printf("%s[%d]%s", file_string((enum register_file) dstReg->File, mode), dstReg->Index, - writemask_string(dstReg->WriteMask)); + _mesa_writemask_string(dstReg->WriteMask)); #endif } |