diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2003-07-17 13:43:59 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2003-07-17 13:43:59 +0000 |
| commit | 6dc85575000127630489b407c50a4b3ea87c9acb (patch) | |
| tree | c79b24b7059577caf8201eeb7a42a6890721f52b /src/mesa/tnl/t_vb_normals.c | |
| parent | 44c699949ac09459771304a8aec8f2fc622057fb (diff) | |
Merge Jose's documentation and core Mesa changes from embedded branch
Diffstat (limited to 'src/mesa/tnl/t_vb_normals.c')
| -rw-r--r-- | src/mesa/tnl/t_vb_normals.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_vb_normals.c b/src/mesa/tnl/t_vb_normals.c index 4cf4bb65c7..22c9729143 100644 --- a/src/mesa/tnl/t_vb_normals.c +++ b/src/mesa/tnl/t_vb_normals.c @@ -87,7 +87,6 @@ static GLboolean run_validate_normal_stage( GLcontext *ctx, { struct normal_stage_data *store = NORMAL_STAGE_DATA(stage); - ASSERT(ctx->_NeedNormals); if (ctx->_NeedEyeCoords) { GLuint transform = NORM_TRANSFORM_NO_ROT; @@ -136,7 +135,9 @@ static GLboolean run_validate_normal_stage( GLcontext *ctx, static void check_normal_transform( GLcontext *ctx, struct gl_pipeline_stage *stage ) { - stage->active = ctx->_NeedNormals && !ctx->VertexProgram.Enabled; + stage->active = !ctx->VertexProgram.Enabled && + (ctx->Light.Enabled || (ctx->Texture._GenFlags & TEXGEN_NEED_NORMALS)); + /* Don't clobber the initialize function: */ if (stage->privatePtr) |