summaryrefslogtreecommitdiff
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-12-17 11:29:42 -0700
committerBrian Paul <brian.paul@tungstengraphics.com>2008-12-17 11:29:42 -0700
commita8751f49167df81611390377aa3e84aba1ed3ae3 (patch)
tree25c367f849d4704398d693028af23cfaf1233f85 /src/mesa/main
parentcdaaf8e107010624bed4abdf9553c0ef63c8b708 (diff)
Revert "mesa: fix vertex program test in get_fp_input_mask()"
This reverts commit cdaaf8e107010624bed4abdf9553c0ef63c8b708.
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/texenvprogram.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index b99bcb1774..c279956f2a 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -215,7 +215,9 @@ 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._Current) {
+ else if (!ctx->VertexProgram._Enabled ||
+ !ctx->VertexProgram._Current) {
+
/* Fixed function logic */
GLbitfield varying_inputs = ctx->varying_vp_inputs;