From: Brian Paul <brianp@vmware.com>
Date: Thu, 4 Jun 2009 19:16:13 +0000 (-0600)
Subject: Merge branch 'mesa_7_5_branch'
X-Git-Tag: 062012170305~17489^2~86
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d58724c51c387c360d2423e29b80ddc0bfa66b7;p=profile%2Fivi%2Fmesa.git

Merge branch 'mesa_7_5_branch'

Conflicts:

	src/mesa/main/context.c
---

9d58724c51c387c360d2423e29b80ddc0bfa66b7
diff --cc src/mesa/main/context.c
index ad47e22,a947f69..bf53bd3
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@@ -1011,6 -1007,20 +1011,16 @@@ _mesa_free_context_data( GLcontext *ct
  
     _mesa_delete_array_object(ctx, ctx->Array.DefaultArrayObj);
  
+ #if FEATURE_ARB_pixel_buffer_object
+    _mesa_reference_buffer_object(ctx, &ctx->Pack.BufferObj, NULL);
+    _mesa_reference_buffer_object(ctx, &ctx->Unpack.BufferObj, NULL);
+ #endif
+ 
+ #if FEATURE_ARB_vertex_buffer_object
+    _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj, NULL);
+    _mesa_reference_buffer_object(ctx, &ctx->Array.ElementArrayBufferObj, NULL);
+ #endif
+ 
 -#if FEATURE_ARB_vertex_buffer_object
 -   _mesa_delete_buffer_object(ctx, ctx->Array.NullBufferObj);
 -#endif
 -
     /* free dispatch tables */
     _mesa_free(ctx->Exec);
     _mesa_free(ctx->Save);