summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-08-04 09:15:09 -0600
committerBrian Paul <brianp@vmware.com>2009-08-04 09:15:09 -0600
commitf0df08abbec173be183d3d6ecf3d4ba5206df179 (patch)
treea0fe5a2035fc21cfd966f43468b5cabecf40fa96 /src
parent9d3929b60c9d4dd4403bcc63cb65d2673cf98b0e (diff)
texenv: Match state.c in deciding whether we'll be using a vertex shader.
(cherry picked from master, commit 40990d9dfb20b69585859b2a45596aa46c20140a)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/texenvprogram.c1
1 files changed, 1 insertions, 0 deletions
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;