Bug #4901: Correct secondary color emission when lighting is turned off, tested

with seccolor on rv200 and r200.

Submitted by:	sroland

diff --git a/src/mesa/drivers/dri/r200/r200_tcl.c b/src/mesa/drivers/dri/r200/r200_tcl.c
index f6461a1..c41622d 100644 (file)
--- 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 90383d4..cd42156 100644 (file)
--- 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 ) {