diff options
| author | Brian <[email protected]> | 2007-10-29 11:54:13 -0600 |
|---|---|---|
| committer | Brian <[email protected]> | 2007-10-29 15:15:34 -0600 |
| commit | 783cedcdc14feda9c8ad0ca754752254bfa589eb (patch) | |
| tree | fbf86278d15886230596d969f4ca3e43c268a99e /src/mesa/tnl | |
| parent | 27153bf02dab57d11565fa7730de4767618ce62d (diff) | |
simplify getting of current frag prog
Diffstat (limited to 'src/mesa/tnl')
| -rw-r--r-- | src/mesa/tnl/t_vp_build.c | 7 |
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 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: */ |