diff options
| author | Eric Anholt <[email protected]> | 2005-10-29 00:27:01 +0000 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2005-10-29 00:27:01 +0000 |
| commit | aba878d8c2d0d75b0762f7d8ae191fa438fc7d6a (patch) | |
| tree | 00bba5ad9473ba8dad85178c76eb01f71bb7650d | |
| parent | d7d41ceeb030d43974b713f8f0af44e972fa4d94 (diff) | |
Bug #4901: Correct secondary color emission when lighting is turned off, tested
with seccolor on rv200 and r200.
Submitted by: sroland
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_tcl.c | 7 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_tcl.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_tcl.c b/src/mesa/drivers/dri/r200/r200_tcl.c index f6461a164e6..c41622debe5 100644 --- a/src/mesa/drivers/dri/r200/r200_tcl.c +++ b/src/mesa/drivers/dri/r200/r200_tcl.c @@ -395,9 +395,10 @@ static GLboolean r200_run_tcl_render( GLcontext *ctx, */ if (ctx->Light.Enabled) { inputs |= VERT_BIT_NORMAL; - if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) { - inputs |= VERT_BIT_COLOR1; - } + } + + if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) { + inputs |= VERT_BIT_COLOR1; } if ( (ctx->Fog.FogCoordinateSource == GL_FOG_COORD) && ctx->Fog.Enabled ) { diff --git a/src/mesa/drivers/dri/radeon/radeon_tcl.c b/src/mesa/drivers/dri/radeon/radeon_tcl.c index 90383d40916..cd421567b61 100644 --- a/src/mesa/drivers/dri/radeon/radeon_tcl.c +++ b/src/mesa/drivers/dri/radeon/radeon_tcl.c @@ -391,9 +391,10 @@ static GLboolean radeon_run_tcl_render( GLcontext *ctx, */ if (ctx->Light.Enabled) { inputs |= VERT_BIT_NORMAL; - if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) { - inputs |= VERT_BIT_COLOR1; - } + } + + if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) { + inputs |= VERT_BIT_COLOR1; } if ( (ctx->Fog.FogCoordinateSource == GL_FOG_COORD) && ctx->Fog.Enabled ) { |