diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/texenvprogram.c | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c index cdf35b4636..a554c033c4 100644 --- a/src/mesa/main/texenvprogram.c +++ b/src/mesa/main/texenvprogram.c @@ -1247,7 +1247,8 @@ _mesa_UpdateTexEnvProgram( GLcontext *ctx )     /* If a conventional fragment program/shader isn't in effect... */     if (!ctx->FragmentProgram._Enabled && -       !ctx->Shader.CurrentProgram) { +       (!ctx->Shader.CurrentProgram || +        !ctx->Shader.CurrentProgram->FragmentProgram) ) {        make_state_key(ctx, &key);        hash = hash_key(&key); | 
