diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-18 19:06:20 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-18 19:07:33 +0100 |
| commit | a8d1521f30766b6a4707aa9966e1f2f9c0b3ac00 (patch) | |
| tree | 3d457d02a4d6167c2b720f8b55a59a32f33aaed9 /src/mesa/vbo/vbo_context.c | |
| parent | 89ab66448e1bcd78caab6678261c2885dcff741c (diff) | |
| parent | 0b8e19ffc51c29543796d4f1e3243e97d8c32671 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/mesa/shader/slang/slang_link.c
Diffstat (limited to 'src/mesa/vbo/vbo_context.c')
| -rw-r--r-- | src/mesa/vbo/vbo_context.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c index 691bf5b450..bbf745b0c6 100644 --- a/src/mesa/vbo/vbo_context.c +++ b/src/mesa/vbo/vbo_context.c @@ -244,12 +244,14 @@ void _vbo_DestroyContext( GLcontext *ctx ) ctx->aelt_context = NULL; } - vbo_exec_destroy(ctx); + if (vbo_context(ctx)) { + vbo_exec_destroy(ctx); #if FEATURE_dlist - vbo_save_destroy(ctx); + vbo_save_destroy(ctx); #endif - FREE(vbo_context(ctx)); - ctx->swtnl_im = NULL; + FREE(vbo_context(ctx)); + ctx->swtnl_im = NULL; + } } |