diff options
author | Brian Paul <brianp@vmware.com> | 2009-10-08 12:50:42 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-10-08 12:50:44 -0600 |
commit | f49d53594c8ba501c39f9a43148ce02a0ec8bfc2 (patch) | |
tree | aeea366358b8fefb8c59dbf94af3ed5308cfc7e8 | |
parent | f67bc2e87255298ac22e8ccd98f482cc62d0ec26 (diff) |
mesa: free display list state after freeing shared state
Fixes bug 24402.
-rw-r--r-- | src/mesa/main/context.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 4d222cb0eb..95ff3495ab 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -971,7 +971,6 @@ _mesa_free_context_data( GLcontext *ctx ) _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._TexEnvProgram, NULL); _mesa_free_attrib_data(ctx); - _mesa_free_display_list_data(ctx); _mesa_free_lighting_data( ctx ); _mesa_free_eval_data( ctx ); _mesa_free_texture_data( ctx ); @@ -1012,6 +1011,9 @@ _mesa_free_context_data( GLcontext *ctx ) _mesa_free_shared_state( ctx, ctx->Shared ); } + /* needs to be after freeing shared state */ + _mesa_free_display_list_data(ctx); + if (ctx->Extensions.String) _mesa_free((void *) ctx->Extensions.String); |