mesa: Branch 'master'

[Roland Scheidegger]

 src/mesa/tnl/t_vb_arbprogram.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 9b9e056615bc63d5498feb6999bd4df431170022 (from ff65fa39e81114fd54c94cb8be235342911c185e)
Author: Roland Scheidegger <sroland at tungstengraphics.com>
Date:   Tue Mar 27 19:32:32 2007 +0200

    recommit e731d8aafa98bbf9d30f83e65f28b7718be55834.
    
    This got lost with glsl-compiler-1 merge, it fixes segfaults when using
    ATI_fragment_shader, which uses the ProgramStringNotify mechanism but doesn't
    have a valid program pointer.

diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c
index 425a866..f0e326f 100644
--- a/src/mesa/tnl/t_vb_arbprogram.c
+++ b/src/mesa/tnl/t_vb_arbprogram.c
@@ -1608,7 +1608,7 @@ const struct tnl_pipeline_stage _tnl_arb
 void
 _tnl_program_string(GLcontext *ctx, GLenum target, struct gl_program *program)
 {
-   if (program->Target == GL_VERTEX_PROGRAM_ARB) {
+   if (target == GL_VERTEX_PROGRAM_ARB) {
       /* free any existing tnl data hanging off the program */
       struct gl_vertex_program *vprog = (struct gl_vertex_program *) program;
       if (vprog->TnlData) {