From a8751f49167df81611390377aa3e84aba1ed3ae3 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 17 Dec 2008 11:29:42 -0700
Subject: Revert "mesa: fix vertex program test in get_fp_input_mask()"

This reverts commit cdaaf8e107010624bed4abdf9553c0ef63c8b708.
---
 src/mesa/main/texenvprogram.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index b99bcb1774..c279956f2a 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -215,7 +215,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._Current) {
+   else if (!ctx->VertexProgram._Enabled ||
+            !ctx->VertexProgram._Current) {
+
       /* Fixed function logic */
       GLbitfield varying_inputs = ctx->varying_vp_inputs;
 
-- 
cgit v1.2.3