From f0df08abbec173be183d3d6ecf3d4ba5206df179 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 4 Aug 2009 09:15:09 -0600
Subject: texenv: Match state.c in deciding whether we'll be using a vertex
 shader.

(cherry picked from master, commit 40990d9dfb20b69585859b2a45596aa46c20140a)
---
 src/mesa/main/texenvprogram.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/mesa')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index a3f1246c98..8229de4c47 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -263,6 +263,7 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
 {
    /* _NEW_PROGRAM */
    const GLboolean vertexShader = (ctx->Shader.CurrentProgram &&
+				   ctx->Shader.CurrentProgram->LinkStatus &&
                                    ctx->Shader.CurrentProgram->VertexProgram);
    const GLboolean vertexProgram = ctx->VertexProgram._Enabled;
    GLbitfield fp_inputs = 0x0;
-- 
cgit v1.2.3