mesa: fix vertex program test in get_fp_input_mask()
authorBrian Paul <brian.paul@tungstengraphics.com>
Wed, 17 Dec 2008 17:55:40 +0000 (10:55 -0700)
committerBrian Paul <brian.paul@tungstengraphics.com>
Wed, 17 Dec 2008 17:58:33 +0000 (10:58 -0700)
We were accidentally using the fixed-function logic when a vertex shader was
being used.

src/mesa/main/texenvprogram.c

index 3cb103f51f8494b0db48954f454e0a9d8774b6d5..e160787eb964e7799d7d50b3b9fe4482fe0d4333 100644 (file)
@@ -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;