From: Brian Paul <brianp@vmware.com>
Date: Tue, 4 Aug 2009 15:15:09 +0000 (-0600)
Subject: texenv: Match state.c in deciding whether we'll be using a vertex shader.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f0df08abbec173be183d3d6ecf3d4ba5206df179;p=mesa.git

texenv: Match state.c in deciding whether we'll be using a vertex shader.

(cherry picked from master, commit 40990d9dfb20b69585859b2a45596aa46c20140a)
---

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index a3f1246c985..8229de4c475 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;