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

Eric Anholt anholt at kemper.freedesktop.org
Mon Aug 3 19:59:44 UTC 2009


Module: Mesa
Branch: master
Commit: 40990d9dfb20b69585859b2a45596aa46c20140a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=40990d9dfb20b69585859b2a45596aa46c20140a

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Aug  3 12:36:52 2009 -0700

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

---

 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 6b090ff..2eefae8 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;




More information about the mesa-commit mailing list