diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2001-02-16 18:14:41 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2001-02-16 18:14:41 +0000 |
| commit | 46b0988c673b28e072fd0cbf477632a9ab6f9f18 (patch) | |
| tree | 3463116da957c6f13dcb0b415ca8476640503fc7 /src/mesa/tnl/t_vb_light.c | |
| parent | 2448fc7deeaa870d879de17158f243f239c05b15 (diff) | |
Allow swrast to cope (fairly) cleanly with GL_SEPERATE_SPECULAR when
texturing is not enabled, and without requiring the two colors be
added externally.
As a part of this, collapsed the decomposition of quads into triangles
inside swrast to be hardwired into _swrast_Quad; removed s_quads.[ch].
Removed checks on texture state from t_vb_light.c, which was previously
required by swrast.
Moved the t_dd_ templates to a new directory.
Diffstat (limited to 'src/mesa/tnl/t_vb_light.c')
| -rw-r--r-- | src/mesa/tnl/t_vb_light.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/mesa/tnl/t_vb_light.c b/src/mesa/tnl/t_vb_light.c index 00beb53123..ce180880fb 100644 --- a/src/mesa/tnl/t_vb_light.c +++ b/src/mesa/tnl/t_vb_light.c @@ -1,4 +1,4 @@ -/* $Id: t_vb_light.c,v 1.7 2001/02/16 00:35:35 keithw Exp $ */ +/* $Id: t_vb_light.c,v 1.8 2001/02/16 18:14:42 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -174,8 +174,7 @@ static GLboolean run_validate_lighting( GLcontext *ctx, if (ctx->Visual.rgbMode) { if (ctx->Light._NeedVertices) { - if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR && - ctx->Texture._ReallyEnabled) + if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR) tab = _tnl_light_spec_tab; else tab = _tnl_light_tab; @@ -271,8 +270,7 @@ static void check_lighting( GLcontext *ctx, struct gl_pipeline_stage *stage ) stage->inputs |= VERT_RGBA; stage->outputs = VERT_RGBA; - if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR && - ctx->Texture._ReallyEnabled) + if (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR) stage->outputs |= VERT_SPEC_RGB; } } @@ -309,9 +307,8 @@ static void dtr( struct gl_pipeline_stage *stage ) const struct gl_pipeline_stage _tnl_lighting_stage = { "lighting", - _NEW_LIGHT|_NEW_TEXTURE, /* recheck; texture for seperate_specular */ - _NEW_LIGHT|_NEW_MODELVIEW| - _NEW_TEXTURE, /* recalc -- modelview dependency + _NEW_LIGHT, /* recheck */ + _NEW_LIGHT|_NEW_MODELVIEW, /* recalc -- modelview dependency * otherwise not captured by inputs * (which may be VERT_OBJ) */ 0,0,0, /* active, inputs, outputs */ |