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

[Brian Paul]

Module: Mesa
Branch: mesa_7_5_branch
Commit: f0df08abbec173be183d3d6ecf3d4ba5206df179
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0df08abbec173be183d3d6ecf3d4ba5206df179

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Aug  4 09:15:09 2009 -0600

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 files changed, 1 insertions(+), 0 deletions(-)

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