Mesa (gallium-0.2): Revert "mesa: fix vertex program test in get_fp_input_mask()"
Brian Paul
brianp at kemper.freedesktop.org
Wed Dec 17 18:29:34 UTC 2008
Module: Mesa
Branch: gallium-0.2
Commit: d7296a1a8e846bc4d41ded1c2406b6f5c658188a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d7296a1a8e846bc4d41ded1c2406b6f5c658188a
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date: Wed Dec 17 11:29:06 2008 -0700
Revert "mesa: fix vertex program test in get_fp_input_mask()"
This reverts commit 8dc88cb64305c591dfadded2b5acbb1e6b04cd7f.
This change broke other things...
---
src/mesa/main/texenvprogram.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index e160787..3cb103f 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;
More information about the mesa-commit
mailing list