diff options
| author | Aapo Tahkola <aet@rasterburn.org> | 2005-12-06 19:49:18 +0000 |
|---|---|---|
| committer | Aapo Tahkola <aet@rasterburn.org> | 2005-12-06 19:49:18 +0000 |
| commit | 9309ba78d176f58ef9c15b3ce11311b8ca69f164 (patch) | |
| tree | 8363c302dc86137f8c19f18854f824827d18f99b /src | |
| parent | 9580179dfb42d5b81ff6ec9704b82a556c7f1229 (diff) | |
Fix secondary color for VP's
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_maos.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_vertexprog.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_maos.c b/src/mesa/drivers/dri/r300/r300_maos.c index 426d028827..447cd026d5 100644 --- 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 f6c9db9fdc..c7a0c10526 100644 --- 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++; |