Mesa (mesa_7_5_branch): texenv: Use VP->Current, since _Current isn' t updated at this point.

Brian Paul brianp at kemper.freedesktop.org
Tue Aug 4 15:18:14 UTC 2009


Module: Mesa
Branch: mesa_7_5_branch
Commit: 2bec909c69c127b4a29eedfcafed9f5f2e23c51e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2bec909c69c127b4a29eedfcafed9f5f2e23c51e

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Aug  4 09:15:33 2009 -0600

texenv: Use VP->Current, since _Current isn't updated at this point.

(cherry picked from master, commit a9ba1bfeb3a2852c6eda718e73c46c972a286648)

---

 src/mesa/main/texenvprogram.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 8229de4..3ff3005 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -329,7 +329,7 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
       if (vertexShader)
          vprog = ctx->Shader.CurrentProgram->VertexProgram;
       else
-         vprog = ctx->VertexProgram._Current;
+         vprog = ctx->VertexProgram.Current;
 
       vp_outputs = vprog->Base.OutputsWritten;
 




More information about the mesa-commit mailing list