diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-12-17 18:05:03 -0700 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-12-17 18:05:03 -0700 |
| commit | 35aebf46679a6450b912b592b83badcfb523b79c (patch) | |
| tree | 57fbee9f53ad09fe90f15368950b46063bf7d7bc | |
| parent | 8e7599892f5dd2f85a74eccf9ff7a80dd277122b (diff) | |
mesa: remove unneeded _mesa_reference_fragprog() call
The subsequent if/else cases always call _mesa_reference_fragprog() anyway.
| -rw-r--r-- | src/mesa/main/state.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index e87a62f59d..df1d197858 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -190,8 +190,8 @@ update_program(GLcontext *ctx) /* * Set the ctx->VertexProgram._Current and ctx->FragmentProgram._Current - * pointers to the programs that should be enabled/used. These will only - * be NULL if we need to use the fixed-function code. + * pointers to the programs that should be used for rendering. If either + * is NULL, use fixed-function code paths. * * These programs may come from several sources. The priority is as * follows: @@ -204,8 +204,6 @@ update_program(GLcontext *ctx) * come up, or matter. */ - _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL); - if (shProg && shProg->LinkStatus && shProg->FragmentProgram) { /* Use shader programs */ _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, |