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:55:40 +0000 (10:55 -0700)
We were accidentally using the fixed-function logic when a vertex shader was
being used.

src/mesa/main/texenvprogram.c

index c279956f2a2d9027cf8822a0de258760d0d2094c..b99bcb1774b728ab955c1e3701f4cdb51e4d105d 100644 (file)
@@ -215,9 +215,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;