Generate a texenv fragment program if there's a GLSL vertex shader but no GLSL fragme...

This allows Glean glsl1 test to get pretty far.

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index cdf35b4..a554c03 100644 (file)
--- 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);