summaryrefslogtreecommitdiff
path: root/src/mesa/main/texenvprogram.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main/texenvprogram.c')
-rw-r--r--src/mesa/main/texenvprogram.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index ea2ee160e4..7049467c22 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -204,7 +204,10 @@ static GLuint get_fp_input_mask( GLcontext *ctx )
{
GLuint fp_inputs = 0;
- if (!ctx->VertexProgram._Enabled) {
+ if (!ctx->VertexProgram._Enabled ||
+ !ctx->VertexProgram._Current) {
+
+ /* Fixed function logic */
GLuint varying_inputs = ctx->varying_vp_inputs;
/* First look at what values may be computed by the generated