diff options
| author | Alan Hourihane <[email protected]> | 2001-11-30 15:42:32 +0000 |
|---|---|---|
| committer | Alan Hourihane <[email protected]> | 2001-11-30 15:42:32 +0000 |
| commit | 9f6957e7021dd04fb2df4ebe0845ff76f3524fb0 (patch) | |
| tree | 5f8b22eff3ca0e8f66c7fe0524ce4385848cbd34 /src | |
| parent | bf7873152382a3fa7ec29c5d702d3fd10d01fd6b (diff) | |
Don't reset the _tnl_CurrentInput pointer on DestroyContext.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/tnl/t_imm_exec.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_imm_exec.c b/src/mesa/tnl/t_imm_exec.c index 8b55fec9681..4113862d1b9 100644 --- a/src/mesa/tnl/t_imm_exec.c +++ b/src/mesa/tnl/t_imm_exec.c @@ -1,4 +1,4 @@ -/* $Id: t_imm_exec.c,v 1.29 2001/08/02 22:39:51 keithw Exp $ */ +/* $Id: t_imm_exec.c,v 1.29.2.1 2001/11/30 15:42:32 alanh Exp $ */ /* * Mesa 3-D graphics library @@ -555,6 +555,13 @@ void _tnl_imm_destroy( GLcontext *ctx ) TNL_CURRENT_IM(ctx)->ref_count--; if (TNL_CURRENT_IM(ctx)->ref_count == 0) _tnl_free_immediate( TNL_CURRENT_IM(ctx) ); - SET_IMMEDIATE(ctx, 0); + /* + * Don't use SET_IMMEDIATE here, or else we'll whack the + * _tnl_CurrentInput pointer - not good when another + * context has already been made current. + * So we just set the context's own tnl immediate pointer + * to 0. + */ + ctx->swtnl_im = 0; } } |