Mesa (gallium-0.1): mesa: fix vertex program test in get_fp_input_mask()
Brian Paul
brianp at kemper.freedesktop.org
Wed Dec 17 17:57:54 UTC 2008
Module: Mesa
Branch: gallium-0.1
Commit: cdaaf8e107010624bed4abdf9553c0ef63c8b708
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cdaaf8e107010624bed4abdf9553c0ef63c8b708
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date: Wed Dec 17 10:55:40 2008 -0700
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.
---
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 c279956..b99bcb1 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;
More information about the mesa-commit
mailing list