summaryrefslogtreecommitdiff
path: root/src/mesa/tnl
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/tnl')
-rw-r--r--src/mesa/tnl/t_vp_build.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c
index 86c6ccc1c0..056eb0db8e 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:
*/