summaryrefslogtreecommitdiff
path: root/src/mesa/main
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2008-02-29 11:15:02 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2008-02-29 11:16:21 +0800
commitde1e9880f8b239768293f7f434a9117dfab20162 (patch)
tree3ce4afb917c39795b0593f3d164802585680cb52 /src/mesa/main
parentb39f15b88f4ef585f260db689294c12b1aee41f2 (diff)
i965: use _Current pointer instead of Current pointer.
fix double free issue(bug#14710). It also corrects glsl/bitmap demo behavior.
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/texenvprogram.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index de7d070b32..b1c00a36ac 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1271,7 +1271,8 @@ _mesa_UpdateTexEnvProgram( GLcontext *ctx )
}
}
else {
- ctx->FragmentProgram._Current = ctx->FragmentProgram.Current;
+ /* _Current pointer has been updated in update_program */
+ // ctx->FragmentProgram._Current = ctx->FragmentProgram.Current;
}
/* Tell the driver about the change. Could define a new target for