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.

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 1560e97c26d3ad7bea4abac40db879a52a199f93..865ef8f9f8983dd5d9f221e6be1113711d73a1c5 100644 (file)
--- 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