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

This reverts commit cdaaf8e107010624bed4abdf9553c0ef63c8b708.

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index b99bcb1774b728ab955c1e3701f4cdb51e4d105d..c279956f2a2d9027cf8822a0de258760d0d2094c 100644 (file)
--- 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;