diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2006-11-02 12:02:13 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2006-11-02 12:02:13 +0000 |
| commit | 6d104cb932080c5c0d951fbc0ec6d30fb7ebef45 (patch) | |
| tree | 17207f566d6eda4d3884ec03dfff6cdb5a1965ea /src/mesa/tnl/t_context.c | |
| parent | 18d52f96bb1f20b1887b67e87506835bca05d73a (diff) | |
merge current trunk into vbo branch
Diffstat (limited to 'src/mesa/tnl/t_context.c')
| -rw-r--r-- | src/mesa/tnl/t_context.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c index 5d6b6dd97d..bd459a7747 100644 --- a/src/mesa/tnl/t_context.c +++ b/src/mesa/tnl/t_context.c @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5 + * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * @@ -135,7 +135,8 @@ _tnl_InvalidateState( GLcontext *ctx, GLuint new_state ) if (ctx->Fog.Enabled || (ctx->FragmentProgram._Active && - ctx->FragmentProgram._Current->FogOption != GL_NONE)) + (ctx->FragmentProgram._Current->FogOption != GL_NONE || + ctx->FragmentProgram._Current->Base.InputsRead & FRAG_BIT_FOGC))) RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_FOG ); if (ctx->Polygon.FrontMode != GL_FILL || |