projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0318757
)
texenv: Match state.c in deciding whether we'll be using a vertex shader.
author
Eric Anholt
<eric@anholt.net>
Mon, 3 Aug 2009 19:36:52 +0000
(12:36 -0700)
committer
Eric Anholt
<eric@anholt.net>
Mon, 3 Aug 2009 19:54:33 +0000
(12:54 -0700)
src/mesa/main/texenvprogram.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/texenvprogram.c
b/src/mesa/main/texenvprogram.c
index 6b090ff399be1d2fc49dbc6c5691a12f0f504a94..2eefae82558ae3267bbe30286fd4e9b81df4ef95 100644
(file)
--- 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;