From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 17 Dec 2008 17:55:40 +0000 (-0700)
Subject: mesa: fix vertex program test in get_fp_input_mask()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8dc88cb64305c591dfadded2b5acbb1e6b04cd7f;p=mesa.git

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.
---

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 3cb103f51f8..e160787eb96 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;