projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9d3929b
)
texenv: Match state.c in deciding whether we'll be using a vertex shader.
author
Brian Paul
<brianp@vmware.com>
Tue, 4 Aug 2009 15:15:09 +0000
(09:15 -0600)
committer
Brian Paul
<brianp@vmware.com>
Tue, 4 Aug 2009 15:15:09 +0000
(09:15 -0600)
(cherry picked from master, commit
40990d9dfb20b69585859b2a45596aa46c20140a
)
src/mesa/main/texenvprogram.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/texenvprogram.c
b/src/mesa/main/texenvprogram.c
index a3f1246c98596f7f11b3333c23b346e79a4a0d0a..8229de4c475ff29d54f6d69766f1ab4ba4713ee6 100644
(file)
--- 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;