diff options
Diffstat (limited to 'src')
| -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, | 
