Merge branch 'mesa_7_5_branch'

2009-05-13 11:33:52 -06:00
parent ac5bf63f74 99960393ed
commit ca327b1688
1 changed files with 2 additions and 1 deletions
--- 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);