summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 b99bcb1774b..c279956f2a2 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;