From: Roland Scheidegger <sroland@tungstengraphics.com>
Date: Tue, 27 Mar 2007 17:32:32 +0000 (+0200)
Subject: recommit e731d8aafa98bbf9d30f83e65f28b7718be55834.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9b9e056615bc63d5498feb6999bd4df431170022;p=mesa.git

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 425a8669948..f0e326f25c4 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_vertex_program_stage =
 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) {