summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2009-08-03 12:36:52 -0700
committerEric Anholt <[email protected]>2009-08-03 12:54:33 -0700
commit40990d9dfb20b69585859b2a45596aa46c20140a (patch)
tree5263e133ef9eab40ce06fe0f75a4f68495d953ae /src/mesa/main
parent03187571b63d97e3d1406d329c5e760e16ef3181 (diff)
texenv: Match state.c in deciding whether we'll be using a vertex shader.
Diffstat (limited to 'src/mesa/main')
-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 6b090ff399b..2eefae82558 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -275,6 +275,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;