Merge branch '965-glsl'

[mesa.git] / src / mesa / main / texenvprogram.c

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 38be03908415ee24612ebe70ff611146c2b35bfb..a2b9657bbb7d7fbced4a8979753f26dab1968826 100644 (file)
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1242,7 +1242,7 @@ _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);