Merge branch 'mesa_7_5_branch'

Conflicts:

	src/mesa/main/context.c

diff --combined src/mesa/main/context.c
index ad47e22,a947f69..bf53bd3
--- 1/src/mesa/main/context.c
--- 2/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@@ -455,7 -455,7 +455,7 @@@ _mesa_init_current(GLcontext *ctx
     GLuint i;
  
     /* Init all to (0,0,0,1) */
 -   for (i = 0; i < VERT_ATTRIB_MAX; i++) {
 +   for (i = 0; i < Elements(ctx->Current.Attrib); i++) {
        ASSIGN_4V( ctx->Current.Attrib[i], 0.0, 0.0, 0.0, 1.0 );
     }
  
@@@ -602,10 -602,6 +602,10 @@@ _mesa_init_constants(GLcontext *ctx
     ASSERT(MAX_NV_VERTEX_PROGRAM_TEMPS <= MAX_PROGRAM_TEMPS);
     ASSERT(MAX_NV_VERTEX_PROGRAM_INPUTS <= VERT_ATTRIB_MAX);
     ASSERT(MAX_NV_VERTEX_PROGRAM_OUTPUTS <= VERT_RESULT_MAX);
 +
 +   /* check that we don't exceed various 32-bit bitfields */
 +   ASSERT(VERT_RESULT_MAX <= 32);
 +   ASSERT(FRAG_ATTRIB_MAX <= 32);
  }
  
  
@@@ -1011,6 -1007,20 +1011,16 @@@ _mesa_free_context_data( GLcontext *ct
  
     _mesa_delete_array_object(ctx, ctx->Array.DefaultArrayObj);
  
 -#if FEATURE_ARB_vertex_buffer_object
 -   _mesa_delete_buffer_object(ctx, ctx->Array.NullBufferObj);
 -#endif
 -
+ #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
+ 
     /* free dispatch tables */
     _mesa_free(ctx->Exec);
     _mesa_free(ctx->Save);