From 783cedcdc14feda9c8ad0ca754752254bfa589eb Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 29 Oct 2007 11:54:13 -0600 Subject: simplify getting of current frag prog --- src/mesa/tnl/t_vp_build.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/mesa/tnl/t_vp_build.c') 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: */ -- cgit v1.2.3