summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-05-13 11:33:52 -0600
committerBrian Paul <[email protected]>2009-05-13 11:33:52 -0600
commitca327b1688a8f70a4d01bf80d11508c90aafe64f (patch)
tree0884267abbc885d99f0d66178fe967be7632298b
parentac5bf63f7408414bf8d7993ad77d92b76830cec6 (diff)
parent99960393edb3d6c0d3702cf51b59c2e4189117c7 (diff)
Merge branch 'mesa_7_5_branch'
-rw-r--r--src/mesa/drivers/dri/intel/intel_context.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 5d65e521c2d..49eadc75328 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -756,7 +756,8 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv)
INTEL_FIREVERTICES(intel);
- _mesa_delete_array_object(&intel->ctx, intel->clear.arrayObj);
+ if (intel->clear.arrayObj)
+ _mesa_delete_array_object(&intel->ctx, intel->clear.arrayObj);
intel->vtbl.destroy(intel);