diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index ec3a750e87f..a5ba3533bd4 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -683,39 +683,40 @@ intelDestroyContext(__DRIcontext * driContextPriv) struct gl_context *ctx = &brw->ctx; assert(brw); /* should never be null */ - if (brw) { - /* Dump a final BMP in case the application doesn't call SwapBuffers */ - if (INTEL_DEBUG & DEBUG_AUB) { - intel_batchbuffer_flush(brw); - aub_dump_bmp(&brw->ctx); - } + if (!brw) + return; - _mesa_meta_free(&brw->ctx); + /* Dump a final BMP in case the application doesn't call SwapBuffers */ + if (INTEL_DEBUG & DEBUG_AUB) { + intel_batchbuffer_flush(brw); + aub_dump_bmp(&brw->ctx); + } - brw->vtbl.destroy(brw); + _mesa_meta_free(&brw->ctx); - if (ctx->swrast_context) { - _swsetup_DestroyContext(&brw->ctx); - _tnl_DestroyContext(&brw->ctx); - } - _vbo_DestroyContext(&brw->ctx); + brw->vtbl.destroy(brw); - if (ctx->swrast_context) - _swrast_DestroyContext(&brw->ctx); + if (ctx->swrast_context) { + _swsetup_DestroyContext(&brw->ctx); + _tnl_DestroyContext(&brw->ctx); + } + _vbo_DestroyContext(&brw->ctx); - intel_batchbuffer_free(brw); + if (ctx->swrast_context) + _swrast_DestroyContext(&brw->ctx); - drm_intel_bo_unreference(brw->first_post_swapbuffers_batch); - brw->first_post_swapbuffers_batch = NULL; + intel_batchbuffer_free(brw); - driDestroyOptionCache(&brw->optionCache); + drm_intel_bo_unreference(brw->first_post_swapbuffers_batch); + brw->first_post_swapbuffers_batch = NULL; - /* free the Mesa context */ - _mesa_free_context_data(&brw->ctx); + driDestroyOptionCache(&brw->optionCache); - ralloc_free(brw); - driContextPriv->driverPrivate = NULL; - } + /* free the Mesa context */ + _mesa_free_context_data(&brw->ctx); + + ralloc_free(brw); + driContextPriv->driverPrivate = NULL; } GLboolean |