Revert "mesa: fix vertex program test in get_fp_input_mask()"

This reverts commit 8dc88cb64305c591dfadded2b5acbb1e6b04cd7f.

This change broke other things...

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index e160787eb964e7799d7d50b3b9fe4482fe0d4333..3cb103f51f8494b0db48954f454e0a9d8774b6d5 100644 (file)
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -227,7 +227,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;