Mesa (master): mesa: use fp pointer in _tnl_InvalidateState()

[Brian Paul]

Module: Mesa
Branch: master
Commit: c88c8d7993547796eae52e5e63685d722c548b52
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c88c8d7993547796eae52e5e63685d722c548b52

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Feb 27 15:42:35 2009 -0700

mesa: use fp pointer in _tnl_InvalidateState()

---

 src/mesa/tnl/t_context.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index f0d31fd..f69b122 100644
--- a/src/mesa/tnl/t_context.c
+++ b/src/mesa/tnl/t_context.c
@@ -149,13 +149,10 @@ _tnl_InvalidateState( GLcontext *ctx, GLuint new_state )
       /* fixed-function fog */
       RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_FOG );
    }
-   else if (ctx->FragmentProgram._Current) {
-      struct gl_fragment_program *fp = ctx->FragmentProgram._Current;
-      if (fp) {
-         if (fp->FogOption != GL_NONE || (fp->Base.InputsRead & FRAG_BIT_FOGC)) {
-            /* fragment program needs fog coord */
-            RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_FOG );
-         }
+   else if (fp) {
+      if (fp->FogOption != GL_NONE || (fp->Base.InputsRead & FRAG_BIT_FOGC)) {
+         /* fragment program needs fog coord */
+         RENDERINPUTS_SET( tnl->render_inputs_bitset, _TNL_ATTRIB_FOG );
       }
    }