diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-12-17 10:55:40 -0700 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-12-17 10:58:33 -0700 |
| commit | 8dc88cb64305c591dfadded2b5acbb1e6b04cd7f (patch) | |
| tree | ab2598fa5d8af3624a40b9f3a8ed259af13dd400 /src/mesa/main | |
| parent | 6b88d9606f5cc8147b9ef13c70a9416313c52205 (diff) | |
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.
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/texenvprogram.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c index 3cb103f51f..e160787eb9 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; |