From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 2 Oct 2007 22:55:21 +0000 (-0600)
Subject: Generate a texenv fragment program if there's a GLSL vertex shader but no GLSL fragme... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d781cdc8fadc802a1f2edbeb13ccb1ee768ce803;p=mesa.git

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

This allows Glean glsl1 test to get pretty far.
---

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index cdf35b46369..a554c033c40 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);