Mesa (gallium-0.2): mesa: fix vertex program test in get_fp_input_mask()

[Brian Paul]

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

Author: Brian Paul <brian.paul at tungstengraphics.com>
Date:   Wed Dec 17 10:55:40 2008 -0700

mesa: fix vertex program test in get_fp_input_mask()

We were accidentally using the fixed-function logic when a vertex shader was
being used.

---

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

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 3cb103f..e160787 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -227,9 +227,7 @@ 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 ||
-            !ctx->VertexProgram._Current) {
-
+   else if (!ctx->VertexProgram._Current) {
       /* Fixed function logic */
       GLbitfield varying_inputs = ctx->varying_vp_inputs;