summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2008-12-17 11:29:06 -0700
committerBrian Paul <[email protected]>2008-12-17 11:29:06 -0700
commitd7296a1a8e846bc4d41ded1c2406b6f5c658188a (patch)
tree57c6e49a7e7f5808dd5ecafdfd3207c80a90586f /src
parent8dc88cb64305c591dfadded2b5acbb1e6b04cd7f (diff)
Revert "mesa: fix vertex program test in get_fp_input_mask()"
This reverts commit 8dc88cb64305c591dfadded2b5acbb1e6b04cd7f. This change broke other things...
Diffstat (limited to 'src')
-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 e160787eb96..3cb103f51f8 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -227,7 +227,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;