mesa: Branch 'master'

[Jerome Glisse]

 src/mesa/shader/program.c |    2 ++
 1 files changed, 2 insertions(+)

New commits:
diff-tree a03fc8277180e2171519165a724849e2254ef0b7 (from 7520478eb055350702d09e533db02258187d8c74)
Author: Jerome Glisse <glisse at freedesktop.org>
Date:   Mon Jan 15 21:19:52 2007 +0100

    mesa: Update _Current along Current on fragment program bound.
    
    Same as a previously committed patch for vertex program, we
    update fragment program ptr _Current along the Current one
    so that _Current can't end up pointing to a no more valid
    program.

diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 6db62f5..8442ba3 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -1953,6 +1953,8 @@ _mesa_BindProgram(GLenum target, GLuint 
    }
    else if (target == GL_FRAGMENT_PROGRAM_NV ||
             target == GL_FRAGMENT_PROGRAM_ARB) {
+      if (ctx->FragmentProgram._Current == ctx->FragmentProgram.Current)
+         ctx->FragmentProgram._Current = (struct gl_fragment_program *) newProg;
       ctx->FragmentProgram.Current = (struct gl_fragment_program *) newProg;
    }
    newProg->RefCount++;