Mesa (gallium-0.2): mesa: fix fixed-function test in get_fp_input_mask() - again.

[Brian Paul]

Module: Mesa
Branch: gallium-0.2
Commit: f0b0794b3885a2fdfb168ec4521c7b5e942d3228
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0b0794b3885a2fdfb168ec4521c7b5e942d3228

Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Wed Dec 17 14:04:03 2008 -0700

mesa: fix fixed-function test in get_fp_input_mask() - again.

The problem we're solving only occured when there was a user-defined
vertex shader but no fragment shader.  Check for that case now.
Fixes glean api2 vertex array failure.

---

 src/mesa/main/texenvprogram.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 1560e97..865ef8f 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -219,6 +219,9 @@ static GLuint translate_tex_src_bit( GLbitfield bit )
  */
 static GLbitfield get_fp_input_mask( GLcontext *ctx )
 {
+   const GLboolean vertexShader = (ctx->Shader.CurrentProgram &&
+                                   ctx->Shader.CurrentProgram->VertexProgram);
+   const GLboolean vertexProgram = ctx->VertexProgram._Enabled;
    GLbitfield fp_inputs = 0x0;
 
    if (ctx->VertexProgram._Overriden) {
@@ -231,10 +234,9 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
    else if (ctx->RenderMode == GL_FEEDBACK) {
       fp_inputs = (FRAG_BIT_COL0 | FRAG_BIT_TEX0);
    }
-   else if (!ctx->VertexProgram._Enabled ||
+   else if (!(vertexProgram || vertexShader) ||
             !ctx->VertexProgram._Current) {
-
-      /* Fixed function logic */
+      /* Fixed function vertex logic */
       GLbitfield varying_inputs = ctx->varying_vp_inputs;
 
       /* These get generated in the setup routine regardless of the