diff options
| author | Ben Skeggs <darktama@iinet.net.au> | 2005-06-08 15:05:19 +0000 |
|---|---|---|
| committer | Ben Skeggs <darktama@iinet.net.au> | 2005-06-08 15:05:19 +0000 |
| commit | 2d2f5a4b19a95477e1cf6915963fe9fdbfc461f7 (patch) | |
| tree | 3ad1a2814e38c9a851cfc04a67e33e0d42a51249 /src/mesa/drivers/dri/r300/r300_maos.c | |
| parent | ee7ad16f3f06140ebbeb195540c15b7016003d62 (diff) | |
- Secondary colour
- Calculate tc_count in EmitArrays (enabled units != nr texcoords).
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_maos.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_maos.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_maos.c b/src/mesa/drivers/dri/r300/r300_maos.c index d9a10b0a06..946bf09ae6 100644 --- a/src/mesa/drivers/dri/r300/r300_maos.c +++ b/src/mesa/drivers/dri/r300/r300_maos.c @@ -385,6 +385,7 @@ void r300EmitArrays(GLcontext * ctx, GLboolean immd) } #endif + r300->state.texture.tc_count = 0; for (i = 0; i < ctx->Const.MaxTextureUnits; i++) { if (inputs & (_TNL_BIT_TEX0 << i)) { CONFIGURE_AOS(i_tex[i], AOS_FORMAT_FLOAT, @@ -393,6 +394,7 @@ void r300EmitArrays(GLcontext * ctx, GLboolean immd) count); vic_1 |= R300_INPUT_CNTL_TC0 << i; + r300->state.texture.tc_count++; } } @@ -536,6 +538,8 @@ void r300EmitArrays(GLcontext * ctx, GLboolean immd) r300->hw.vof.cmd[R300_VOF_CNTL_0] |= R300_VAP_OUTPUT_VTX_FMT_0__POS_PRESENT; if(inputs & _TNL_BIT_COLOR0) r300->hw.vof.cmd[R300_VOF_CNTL_0] |= R300_VAP_OUTPUT_VTX_FMT_0__COLOR_PRESENT; + if(inputs & _TNL_BIT_COLOR1) + r300->hw.vof.cmd[R300_VOF_CNTL_0] |= R300_VAP_OUTPUT_VTX_FMT_0__COLOR_1_PRESENT; for(i=0;i < ctx->Const.MaxTextureUnits;i++) if(inputs & (_TNL_BIT_TEX0<<i)) |