r300compiler: Add MRT number to debugging output.

diff --git a/src/mesa/drivers/dri/r300/compiler/r300_fragprog.c b/src/mesa/drivers/dri/r300/compiler/r300_fragprog.c
index aa69b0fc72b167307d26fb44762feb4acc0bca6a..928c15e1e405cd082d3532727350d234b736b76a 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/r300_fragprog.c
+++ b/src/mesa/drivers/dri/r300/compiler/r300_fragprog.c
@@ -297,7 +297,7 @@ void r300FragmentProgramDump(struct rX00_fragment_program_code *c)
                        if (flags[0] != 0) {
                                sprintf(tmp, "o%i.%s",
                                        (code->alu.inst[i].
-                                        rgb_addr >> R300_ALU_DSTC_SHIFT) & 31,
+                                        rgb_addr >> 29) & 3,
                                        flags);
                                strcat(dstc, tmp);
                        }
@@ -311,7 +311,7 @@ void r300FragmentProgramDump(struct rX00_fragment_program_code *c)
                        if (code->alu.inst[i].alpha_addr & R300_ALU_DSTA_OUTPUT) {
                                sprintf(tmp, "o%i.w ",
                                        (code->alu.inst[i].
-                                        alpha_addr >> R300_ALU_DSTA_SHIFT) & 31);
+                                        alpha_addr >> 25) & 3);
                                strcat(dsta, tmp);
                        }
                        if (code->alu.inst[i].alpha_addr & R300_ALU_DSTA_DEPTH) {

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_program_print.c b/src/mesa/drivers/dri/r300/compiler/radeon_program_print.c
index d863b82d53f1328bd9b4e5db772a9d7f6300d8b8..28fb9eae9256990cf3f137664d307431d20c796c 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/radeon_program_print.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_program_print.c
@@ -229,7 +229,7 @@ static void rc_print_pair_instruction(FILE * f, struct rc_instruction * fullinst
                                (inst->RGB.WriteMask & 2) ? "y" : "",
                                (inst->RGB.WriteMask & 4) ? "z" : "");
                if (inst->RGB.OutputWriteMask)
-                       fprintf(f, " color.%s%s%s",
+                       fprintf(f, " color[%i].%s%s%s", inst->RGB.Target,
                                (inst->RGB.OutputWriteMask & 1) ? "x" : "",
                                (inst->RGB.OutputWriteMask & 2) ? "y" : "",
                                (inst->RGB.OutputWriteMask & 4) ? "z" : "");
@@ -255,7 +255,7 @@ static void rc_print_pair_instruction(FILE * f, struct rc_instruction * fullinst
                if (inst->Alpha.WriteMask)
                        fprintf(f, " temp[%i].w", inst->Alpha.DestIndex);
                if (inst->Alpha.OutputWriteMask)
-                       fprintf(f, " color.w");
+                       fprintf(f, " color[%i].w", inst->Alpha.Target);
                if (inst->Alpha.DepthWriteMask)
                        fprintf(f, " depth.w");
                if (inst->WriteALUResult == RC_ALURESULT_W)