simplify getting of current frag prog

diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c
index 86c6ccc1c0e6d78191cdb859a1be14a0cfa696cd..056eb0db8efc9f97fef66d2eded436ffcc1ee8e2 100644 (file)
--- a/src/mesa/tnl/t_vp_build.c
+++ b/src/mesa/tnl/t_vp_build.c
@@ -122,12 +122,7 @@ static struct state_key *make_state_key( GLcontext *ctx )
    struct state_key *key = CALLOC_STRUCT(state_key);
    GLuint i;
 
-   if (ctx->Shader.CurrentProgram &&
-       ctx->Shader.CurrentProgram->LinkStatus &&
-       ctx->Shader.CurrentProgram->FragmentProgram)
-      fp = ctx->Shader.CurrentProgram->FragmentProgram;
-   else
-      fp = ctx->FragmentProgram._Current;
+   fp = ctx->FragmentProgram._Current;
 
    /* This now relies on texenvprogram.c being active:
     */