OSDN Git Service

texenv: Match state.c in deciding whether we'll be using a vertex shader.
authorBrian Paul <brianp@vmware.com>
Tue, 4 Aug 2009 15:15:09 +0000 (09:15 -0600)
committerBrian 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

index a3f1246..8229de4 100644 (file)
@@ -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;