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:55:40 -0700 |
| commit | cdaaf8e107010624bed4abdf9553c0ef63c8b708 (patch) | |
| tree | b8422d65225b840c0fafa1492b3e482809e6afa1 /src/mesa | |
| parent | 2a299851b9ee06fafc03cf4dc7d26023bac17f69 (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')
| -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 c279956f2a..b99bcb1774 100644 --- a/src/mesa/main/texenvprogram.c +++ b/src/mesa/main/texenvprogram.c @@ -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; |