Fix secondary color for VP's

diff --git a/src/mesa/drivers/dri/r300/r300_maos.c b/src/mesa/drivers/dri/r300/r300_maos.c
index 426d028..447cd02 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_maos.c
+++ b/src/mesa/drivers/dri/r300/r300_maos.c
@@ -523,9 +523,9 @@ void r300EmitArrays(GLcontext * ctx, GLboolean immd)
                        r300->hw.vof.cmd[R300_VOF_CNTL_0] |= R300_VAP_OUTPUT_VTX_FMT_0__POS_PRESENT;
                if(OutputsWritten & (1<<VERT_RESULT_COL0))
                        r300->hw.vof.cmd[R300_VOF_CNTL_0] |= R300_VAP_OUTPUT_VTX_FMT_0__COLOR_PRESENT;
-               /*if(OutputsWritten & (1<<VERT_RESULT_COL1))
+               if(OutputsWritten & (1<<VERT_RESULT_COL1))
                        r300->hw.vof.cmd[R300_VOF_CNTL_0] |= R300_VAP_OUTPUT_VTX_FMT_0__COLOR_1_PRESENT;
-               if(OutputsWritten & (1<<VERT_RESULT_BFC0))
+               /*if(OutputsWritten & (1<<VERT_RESULT_BFC0))
                        r300->hw.vof.cmd[R300_VOF_CNTL_0] |= R300_VAP_OUTPUT_VTX_FMT_0__COLOR_2_PRESENT;
                if(OutputsWritten & (1<<VERT_RESULT_BFC1))
                        r300->hw.vof.cmd[R300_VOF_CNTL_0] |= R300_VAP_OUTPUT_VTX_FMT_0__COLOR_3_PRESENT;*/
@@ -843,9 +843,9 @@ void r300EmitArraysVtx(GLcontext * ctx, GLboolean immd)
                        r300->hw.vof.cmd[R300_VOF_CNTL_0] |= R300_VAP_OUTPUT_VTX_FMT_0__POS_PRESENT;
                if(OutputsWritten & (1<<VERT_RESULT_COL0))
                        r300->hw.vof.cmd[R300_VOF_CNTL_0] |= R300_VAP_OUTPUT_VTX_FMT_0__COLOR_PRESENT;
-               /*if(OutputsWritten & (1<<VERT_RESULT_COL1))
+               if(OutputsWritten & (1<<VERT_RESULT_COL1))
                        r300->hw.vof.cmd[R300_VOF_CNTL_0] |= R300_VAP_OUTPUT_VTX_FMT_0__COLOR_1_PRESENT;
-               if(OutputsWritten & (1<<VERT_RESULT_BFC0))
+               /*if(OutputsWritten & (1<<VERT_RESULT_BFC0))
                        r300->hw.vof.cmd[R300_VOF_CNTL_0] |= R300_VAP_OUTPUT_VTX_FMT_0__COLOR_2_PRESENT;
                if(OutputsWritten & (1<<VERT_RESULT_BFC1))
                        r300->hw.vof.cmd[R300_VOF_CNTL_0] |= R300_VAP_OUTPUT_VTX_FMT_0__COLOR_3_PRESENT;*/

diff --git a/src/mesa/drivers/dri/r300/r300_vertexprog.c b/src/mesa/drivers/dri/r300/r300_vertexprog.c
index f6c9db9..c7a0c10 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_vertexprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertexprog.c
@@ -475,13 +475,13 @@ void translate_vertex_shader(struct r300_vertex_program *vp)
        if(mesa_vp->Base.OutputsWritten & (1 << VERT_RESULT_COL0))
                vp->outputs[VERT_RESULT_COL0] = cur_reg++;
        
+       if(mesa_vp->Base.OutputsWritten & (1 << VERT_RESULT_COL1))
+               vp->outputs[VERT_RESULT_COL1] = cur_reg++;
+       
 #if 0 /* Not supported yet */
        if(mesa_vp->Base.OutputsWritten & (1 << VERT_RESULT_BFC0))
                vp->outputs[VERT_RESULT_BFC0] = cur_reg++;
        
-       if(mesa_vp->Base.OutputsWritten & (1 << VERT_RESULT_COL1))
-               vp->outputs[VERT_RESULT_COL1] = cur_reg++;
-       
        if(mesa_vp->Base.OutputsWritten & (1 << VERT_RESULT_BFC1))
                vp->outputs[VERT_RESULT_BFC1] = cur_reg++;