From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 29 Oct 2007 17:54:13 +0000 (-0600)
Subject: simplify getting of current frag prog
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=783cedcdc14feda9c8ad0ca754752254bfa589eb;p=mesa.git

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 86c6ccc1c0e..056eb0db8ef 100644
--- 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:
     */