Merge remote-tracking branch 'origin/released'

Conflicts:
	libX11/configure.ac
	mesalib/configs/linux-dri
	mesalib/docs/download.html
	mesalib/src/SConscript
	mesalib/src/mesa/main/bufferobj.c
	mesalib/src/mesa/main/bufferobj.h
	mesalib/src/mesa/main/framebuffer.c
	mesalib/src/mesa/main/renderbuffer.c
	mesalib/src/mesa/main/renderbuffer.h
	mesalib/src/mesa/main/texobj.c
	mesalib/src/mesa/program/program.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	xorg-server/dix/window.c
	xorg-server/xkb/xkb.c
	xorg-server/xkb/xkmread.c

11 files changed, 2424 insertions, 2387 deletions

diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index 31faaebd4..07b678373 100644
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -1,1918 +1,1917 @@
-/*

- * Mesa 3-D graphics library

- * Version:  7.6

- *

- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-/**

- * \file bufferobj.c

- * \brief Functions for the GL_ARB_vertex/pixel_buffer_object extensions.

- * \author Brian Paul, Ian Romanick

- */

-

-

-#include "glheader.h"

-#include "enums.h"

-#include "hash.h"

-#include "imports.h"

-#include "image.h"

-#include "context.h"

-#include "bufferobj.h"

-#include "fbobject.h"

-#include "mfeatures.h"

-#include "mtypes.h"

-#include "texobj.h"

-

-

-/* Debug flags */

-/*#define VBO_DEBUG*/

-/*#define BOUNDS_CHECK*/

-

-

-#if FEATURE_OES_mapbuffer

-#define DEFAULT_ACCESS GL_MAP_WRITE_BIT

-#else

-#define DEFAULT_ACCESS (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)

-#endif

-

-

-/**

- * Used as a placeholder for buffer objects between glGenBuffers() and

- * glBindBuffer() so that glIsBuffer() can work correctly.

- */

-static struct gl_buffer_object DummyBufferObject;

-

-

-/**

- * Return pointer to address of a buffer object target.

- * \param ctx  the GL context

- * \param target  the buffer object target to be retrieved.

- * \return   pointer to pointer to the buffer object bound to \c target in the

- *           specified context or \c NULL if \c target is invalid.

- */

-static INLINE struct gl_buffer_object **

-get_buffer_target(struct gl_context *ctx, GLenum target)

-{

-   switch (target) {

-   case GL_ARRAY_BUFFER_ARB:

-      return &ctx->Array.ArrayBufferObj;

-   case GL_ELEMENT_ARRAY_BUFFER_ARB:

-      return &ctx->Array.ElementArrayBufferObj;

-   case GL_PIXEL_PACK_BUFFER_EXT:

-      return &ctx->Pack.BufferObj;

-   case GL_PIXEL_UNPACK_BUFFER_EXT:

-      return &ctx->Unpack.BufferObj;

-   case GL_COPY_READ_BUFFER:

-      return &ctx->CopyReadBuffer;

-   case GL_COPY_WRITE_BUFFER:

-      return &ctx->CopyWriteBuffer;

-#if FEATURE_EXT_transform_feedback

-   case GL_TRANSFORM_FEEDBACK_BUFFER:

-      if (ctx->Extensions.EXT_transform_feedback) {

-         return &ctx->TransformFeedback.CurrentBuffer;

-      }

-      break;

-#endif

-   case GL_TEXTURE_BUFFER:

-      if (ctx->Extensions.ARB_texture_buffer_object) {

-         return &ctx->Texture.BufferObject;

-      }

-      break;

-   default:

-      return NULL;

-   }

-   return NULL;

-}

-

-

-/**

- * Get the buffer object bound to the specified target in a GL context.

- * \param ctx  the GL context

- * \param target  the buffer object target to be retrieved.

- * \return   pointer to the buffer object bound to \c target in the

- *           specified context or \c NULL if \c target is invalid.

- */

-static INLINE struct gl_buffer_object *

-get_buffer(struct gl_context *ctx, GLenum target)

-{

-   struct gl_buffer_object **bufObj = get_buffer_target(ctx, target);

-   if (bufObj)

-      return *bufObj;

-   return NULL;

-}

-

-

-/**

- * Convert a GLbitfield describing the mapped buffer access flags

- * into one of GL_READ_WRITE, GL_READ_ONLY, or GL_WRITE_ONLY.

- */

-static GLenum

-simplified_access_mode(GLbitfield access)

-{

-   const GLbitfield rwFlags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;

-   if ((access & rwFlags) == rwFlags)

-      return GL_READ_WRITE;

-   if ((access & GL_MAP_READ_BIT) == GL_MAP_READ_BIT)

-      return GL_READ_ONLY;

-   if ((access & GL_MAP_WRITE_BIT) == GL_MAP_WRITE_BIT)

-      return GL_WRITE_ONLY;

-   return GL_READ_WRITE; /* this should never happen, but no big deal */

-}

-

-

-/**

- * Tests the subdata range parameters and sets the GL error code for

- * \c glBufferSubDataARB and \c glGetBufferSubDataARB.

- *

- * \param ctx     GL context.

- * \param target  Buffer object target on which to operate.

- * \param offset  Offset of the first byte of the subdata range.

- * \param size    Size, in bytes, of the subdata range.

- * \param caller  Name of calling function for recording errors.

- * \return   A pointer to the buffer object bound to \c target in the

- *           specified context or \c NULL if any of the parameter or state

- *           conditions for \c glBufferSubDataARB or \c glGetBufferSubDataARB

- *           are invalid.

- *

- * \sa glBufferSubDataARB, glGetBufferSubDataARB

- */

-static struct gl_buffer_object *

-buffer_object_subdata_range_good( struct gl_context * ctx, GLenum target, 

-                                  GLintptrARB offset, GLsizeiptrARB size,

-                                  const char *caller )

-{

-   struct gl_buffer_object *bufObj;

-

-   if (size < 0) {

-      _mesa_error(ctx, GL_INVALID_VALUE, "%s(size < 0)", caller);

-      return NULL;

-   }

-

-   if (offset < 0) {

-      _mesa_error(ctx, GL_INVALID_VALUE, "%s(offset < 0)", caller);

-      return NULL;

-   }

-

-   bufObj = get_buffer(ctx, target);

-   if (!bufObj) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "%s(target)", caller);

-      return NULL;

-   }

-   if (!_mesa_is_bufferobj(bufObj)) {

-      _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);

-      return NULL;

-   }

-   if (offset + size > bufObj->Size) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-		  "%s(size + offset > buffer size)", caller);

-      return NULL;

-   }

-   if (_mesa_bufferobj_mapped(bufObj)) {

-      /* Buffer is currently mapped */

-      _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);

-      return NULL;

-   }

-

-   return bufObj;

-}

-

-

-/**

- * Allocate and initialize a new buffer object.

- * 

- * Default callback for the \c dd_function_table::NewBufferObject() hook.

- */

-struct gl_buffer_object *

-_mesa_new_buffer_object( struct gl_context *ctx, GLuint name, GLenum target )

-{

-   struct gl_buffer_object *obj;

-

-   (void) ctx;

-

-   obj = MALLOC_STRUCT(gl_buffer_object);

-   _mesa_initialize_buffer_object(obj, name, target);

-   return obj;

-}

-

-

-/**

- * Delete a buffer object.

- * 

- * Default callback for the \c dd_function_table::DeleteBuffer() hook.

- */

-void

-_mesa_delete_buffer_object(struct gl_context *ctx,

-                           struct gl_buffer_object *bufObj)

-{

-   (void) ctx;

-

-   if (bufObj->Data)

-      free(bufObj->Data);

-

-   /* assign strange values here to help w/ debugging */

-   bufObj->RefCount = -1000;

-   bufObj->Name = ~0;

-

-   _glthread_DESTROY_MUTEX(bufObj->Mutex);

-   free(bufObj);

-}

-

-

-

-/**

- * Set ptr to bufObj w/ reference counting.

- */

-void

-_mesa_reference_buffer_object(struct gl_context *ctx,

-                              struct gl_buffer_object **ptr,

-                              struct gl_buffer_object *bufObj)

-{

-   if (*ptr == bufObj)

-      return;

-

-   if (*ptr) {

-      /* Unreference the old buffer */

-      GLboolean deleteFlag = GL_FALSE;

-      struct gl_buffer_object *oldObj = *ptr;

-

-      _glthread_LOCK_MUTEX(oldObj->Mutex);

-      ASSERT(oldObj->RefCount > 0);

-      oldObj->RefCount--;

-#if 0

-      printf("BufferObj %p %d DECR to %d\n",

-             (void *) oldObj, oldObj->Name, oldObj->RefCount);

-#endif

-      deleteFlag = (oldObj->RefCount == 0);

-      _glthread_UNLOCK_MUTEX(oldObj->Mutex);

-

-      if (deleteFlag) {

-

-         /* some sanity checking: don't delete a buffer still in use */

-#if 0

-         /* unfortunately, these tests are invalid during context tear-down */

-	 ASSERT(ctx->Array.ArrayBufferObj != bufObj);

-	 ASSERT(ctx->Array.ElementArrayBufferObj != bufObj);

-	 ASSERT(ctx->Array.ArrayObj->Vertex.BufferObj != bufObj);

-#endif

-

-	 ASSERT(ctx->Driver.DeleteBuffer);

-         ctx->Driver.DeleteBuffer(ctx, oldObj);

-      }

-

-      *ptr = NULL;

-   }

-   ASSERT(!*ptr);

-

-   if (bufObj) {

-      /* reference new buffer */

-      _glthread_LOCK_MUTEX(bufObj->Mutex);

-      if (bufObj->RefCount == 0) {

-         /* this buffer's being deleted (look just above) */

-         /* Not sure this can every really happen.  Warn if it does. */

-         _mesa_problem(NULL, "referencing deleted buffer object");

-         *ptr = NULL;

-      }

-      else {

-         bufObj->RefCount++;

-#if 0

-         printf("BufferObj %p %d INCR to %d\n",

-                (void *) bufObj, bufObj->Name, bufObj->RefCount);

-#endif

-         *ptr = bufObj;

-      }

-      _glthread_UNLOCK_MUTEX(bufObj->Mutex);

-   }

-}

-

-

-/**

- * Initialize a buffer object to default values.

- */

-void

-_mesa_initialize_buffer_object( struct gl_buffer_object *obj,

-				GLuint name, GLenum target )

-{

-   (void) target;

-

-   memset(obj, 0, sizeof(struct gl_buffer_object));

-   _glthread_INIT_MUTEX(obj->Mutex);

-   obj->RefCount = 1;

-   obj->Name = name;

-   obj->Usage = GL_STATIC_DRAW_ARB;

-   obj->AccessFlags = DEFAULT_ACCESS;

-}

-

-

-/**

- * Allocate space for and store data in a buffer object.  Any data that was

- * previously stored in the buffer object is lost.  If \c data is \c NULL,

- * memory will be allocated, but no copy will occur.

- *

- * This is the default callback for \c dd_function_table::BufferData()

- * Note that all GL error checking will have been done already.

- *

- * \param ctx     GL context.

- * \param target  Buffer object target on which to operate.

- * \param size    Size, in bytes, of the new data store.

- * \param data    Pointer to the data to store in the buffer object.  This

- *                pointer may be \c NULL.

- * \param usage   Hints about how the data will be used.

- * \param bufObj  Object to be used.

- *

- * \return GL_TRUE for success, GL_FALSE for failure

- * \sa glBufferDataARB, dd_function_table::BufferData.

- */

-GLboolean

-_mesa_buffer_data( struct gl_context *ctx, GLenum target, GLsizeiptrARB size,

-		   const GLvoid * data, GLenum usage,

-		   struct gl_buffer_object * bufObj )

-{

-   void * new_data;

-

-   (void) ctx; (void) target;

-

-   new_data = _mesa_realloc( bufObj->Data, bufObj->Size, size );

-   if (new_data) {

-      bufObj->Data = (GLubyte *) new_data;

-      bufObj->Size = size;

-      bufObj->Usage = usage;

-

-      if (data) {

-	 memcpy( bufObj->Data, data, size );

-      }

-

-      return GL_TRUE;

-   }

-   else {

-      return GL_FALSE;

-   }

-}

-

-

-/**

- * Replace data in a subrange of buffer object.  If the data range

- * specified by \c size + \c offset extends beyond the end of the buffer or

- * if \c data is \c NULL, no copy is performed.

- *

- * This is the default callback for \c dd_function_table::BufferSubData()

- * Note that all GL error checking will have been done already.

- *

- * \param ctx     GL context.

- * \param target  Buffer object target on which to operate.

- * \param offset  Offset of the first byte to be modified.

- * \param size    Size, in bytes, of the data range.

- * \param data    Pointer to the data to store in the buffer object.

- * \param bufObj  Object to be used.

- *

- * \sa glBufferSubDataARB, dd_function_table::BufferSubData.

- */

-void

-_mesa_buffer_subdata( struct gl_context *ctx, GLenum target, GLintptrARB offset,

-		      GLsizeiptrARB size, const GLvoid * data,

-		      struct gl_buffer_object * bufObj )

-{

-   (void) ctx; (void) target;

-

-   /* this should have been caught in _mesa_BufferSubData() */

-   ASSERT(size + offset <= bufObj->Size);

-

-   if (bufObj->Data) {

-      memcpy( (GLubyte *) bufObj->Data + offset, data, size );

-   }

-}

-

-

-/**

- * Retrieve data from a subrange of buffer object.  If the data range

- * specified by \c size + \c offset extends beyond the end of the buffer or

- * if \c data is \c NULL, no copy is performed.

- *

- * This is the default callback for \c dd_function_table::GetBufferSubData()

- * Note that all GL error checking will have been done already.

- *

- * \param ctx     GL context.

- * \param target  Buffer object target on which to operate.

- * \param offset  Offset of the first byte to be fetched.

- * \param size    Size, in bytes, of the data range.

- * \param data    Destination for data

- * \param bufObj  Object to be used.

- *

- * \sa glBufferGetSubDataARB, dd_function_table::GetBufferSubData.

- */

-void

-_mesa_buffer_get_subdata( struct gl_context *ctx,

-                          GLenum target, GLintptrARB offset,

-			  GLsizeiptrARB size, GLvoid * data,

-			  struct gl_buffer_object * bufObj )

-{

-   (void) ctx; (void) target;

-

-   if (bufObj->Data && ((GLsizeiptrARB) (size + offset) <= bufObj->Size)) {

-      memcpy( data, (GLubyte *) bufObj->Data + offset, size );

-   }

-}

-

-

-/**

- * Default callback for \c dd_function_tabel::MapBuffer().

- *

- * The function parameters will have been already tested for errors.

- *

- * \param ctx     GL context.

- * \param target  Buffer object target on which to operate.

- * \param access  Information about how the buffer will be accessed.

- * \param bufObj  Object to be mapped.

- * \return  A pointer to the object's internal data store that can be accessed

- *          by the processor

- *

- * \sa glMapBufferARB, dd_function_table::MapBuffer

- */

-void *

-_mesa_buffer_map( struct gl_context *ctx, GLenum target, GLenum access,

-		  struct gl_buffer_object *bufObj )

-{

-   (void) ctx;

-   (void) target;

-   (void) access;

-   /* Just return a direct pointer to the data */

-   if (_mesa_bufferobj_mapped(bufObj)) {

-      /* already mapped! */

-      return NULL;

-   }

-   bufObj->Pointer = bufObj->Data;

-   bufObj->Length = bufObj->Size;

-   bufObj->Offset = 0;

-   return bufObj->Pointer;

-}

-

-

-/**

- * Default fallback for \c dd_function_table::MapBufferRange().

- * Called via glMapBufferRange().

- */

-static void *

-_mesa_buffer_map_range( struct gl_context *ctx, GLenum target, GLintptr offset,

-                        GLsizeiptr length, GLbitfield access,

-                        struct gl_buffer_object *bufObj )

-{

-   (void) ctx;

-   (void) target;

-   assert(!_mesa_bufferobj_mapped(bufObj));

-   /* Just return a direct pointer to the data */

-   bufObj->Pointer = bufObj->Data + offset;

-   bufObj->Length = length;

-   bufObj->Offset = offset;

-   bufObj->AccessFlags = access;

-   return bufObj->Pointer;

-}

-

-

-/**

- * Default fallback for \c dd_function_table::FlushMappedBufferRange().

- * Called via glFlushMappedBufferRange().

- */

-static void

-_mesa_buffer_flush_mapped_range( struct gl_context *ctx, GLenum target, 

-                                 GLintptr offset, GLsizeiptr length,

-                                 struct gl_buffer_object *obj )

-{

-   (void) ctx;

-   (void) target;

-   (void) offset;

-   (void) length;

-   (void) obj;

-   /* no-op */

-}

-

-

-/**

- * Default callback for \c dd_function_table::MapBuffer().

- *

- * The input parameters will have been already tested for errors.

- *

- * \sa glUnmapBufferARB, dd_function_table::UnmapBuffer

- */

-GLboolean

-_mesa_buffer_unmap( struct gl_context *ctx, GLenum target,

-                    struct gl_buffer_object *bufObj )

-{

-   (void) ctx;

-   (void) target;

-   /* XXX we might assert here that bufObj->Pointer is non-null */

-   bufObj->Pointer = NULL;

-   bufObj->Length = 0;

-   bufObj->Offset = 0;

-   bufObj->AccessFlags = 0x0;

-   return GL_TRUE;

-}

-

-

-/**

- * Default fallback for \c dd_function_table::CopyBufferSubData().

- * Called via glCopyBuffserSubData().

- */

-static void

-_mesa_copy_buffer_subdata(struct gl_context *ctx,

-                          struct gl_buffer_object *src,

-                          struct gl_buffer_object *dst,

-                          GLintptr readOffset, GLintptr writeOffset,

-                          GLsizeiptr size)

-{

-   GLubyte *srcPtr, *dstPtr;

-

-   /* buffer should not already be mapped */

-   assert(!_mesa_bufferobj_mapped(src));

-   assert(!_mesa_bufferobj_mapped(dst));

-

-   srcPtr = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_COPY_READ_BUFFER,

-                                              GL_READ_ONLY, src);

-   dstPtr = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_COPY_WRITE_BUFFER,

-                                              GL_WRITE_ONLY, dst);

-

-   if (srcPtr && dstPtr)

-      memcpy(dstPtr + writeOffset, srcPtr + readOffset, size);

-

-   ctx->Driver.UnmapBuffer(ctx, GL_COPY_READ_BUFFER, src);

-   ctx->Driver.UnmapBuffer(ctx, GL_COPY_WRITE_BUFFER, dst);

-}

-

-

-

-/**

- * Initialize the state associated with buffer objects

- */

-void

-_mesa_init_buffer_objects( struct gl_context *ctx )

-{

-   memset(&DummyBufferObject, 0, sizeof(DummyBufferObject));

-   _glthread_INIT_MUTEX(DummyBufferObject.Mutex);

-   DummyBufferObject.RefCount = 1000*1000*1000; /* never delete */

-

-   _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj,

-                                 ctx->Shared->NullBufferObj);

-   _mesa_reference_buffer_object(ctx, &ctx->Array.ElementArrayBufferObj,

-                                 ctx->Shared->NullBufferObj);

-

-   _mesa_reference_buffer_object(ctx, &ctx->CopyReadBuffer,

-                                 ctx->Shared->NullBufferObj);

-   _mesa_reference_buffer_object(ctx, &ctx->CopyWriteBuffer,

-                                 ctx->Shared->NullBufferObj);

-}

-

-

-void

-_mesa_free_buffer_objects( struct gl_context *ctx )

-{

-   _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj, NULL);

-   _mesa_reference_buffer_object(ctx, &ctx->Array.ElementArrayBufferObj, NULL);

-

-   _mesa_reference_buffer_object(ctx, &ctx->CopyReadBuffer, NULL);

-   _mesa_reference_buffer_object(ctx, &ctx->CopyWriteBuffer, NULL);

-}

-

-

-/**

- * Bind the specified target to buffer for the specified context.

- * Called by glBindBuffer() and other functions.

- */

-static void

-bind_buffer_object(struct gl_context *ctx, GLenum target, GLuint buffer)

-{

-   struct gl_buffer_object *oldBufObj;

-   struct gl_buffer_object *newBufObj = NULL;

-   struct gl_buffer_object **bindTarget = NULL;

-

-   bindTarget = get_buffer_target(ctx, target);

-   if (!bindTarget) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferARB(target 0x%x)", target);

-      return;

-   }

-

-   /* Get pointer to old buffer object (to be unbound) */

-   oldBufObj = *bindTarget;

-   if (oldBufObj && oldBufObj->Name == buffer)

-      return;   /* rebinding the same buffer object- no change */

-

-   /*

-    * Get pointer to new buffer object (newBufObj)

-    */

-   if (buffer == 0) {

-      /* The spec says there's not a buffer object named 0, but we use

-       * one internally because it simplifies things.

-       */

-      newBufObj = ctx->Shared->NullBufferObj;

-   }

-   else {

-      /* non-default buffer object */

-      newBufObj = _mesa_lookup_bufferobj(ctx, buffer);

-      if (!newBufObj || newBufObj == &DummyBufferObject) {

-         /* If this is a new buffer object id, or one which was generated but

-          * never used before, allocate a buffer object now.

-          */

-         ASSERT(ctx->Driver.NewBufferObject);

-         newBufObj = ctx->Driver.NewBufferObject(ctx, buffer, target);

-         if (!newBufObj) {

-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindBufferARB");

-            return;

-         }

-         _mesa_HashInsert(ctx->Shared->BufferObjects, buffer, newBufObj);

-      }

-   }

-   

-   /* bind new buffer */

-   _mesa_reference_buffer_object(ctx, bindTarget, newBufObj);

-

-   /* Pass BindBuffer call to device driver */

-   if (ctx->Driver.BindBuffer)

-      ctx->Driver.BindBuffer( ctx, target, newBufObj );

-}

-

-

-/**

- * Update the default buffer objects in the given context to reference those

- * specified in the shared state and release those referencing the old 

- * shared state.

- */

-void

-_mesa_update_default_objects_buffer_objects(struct gl_context *ctx)

-{

-   /* Bind the NullBufferObj to remove references to those

-    * in the shared context hash table.

-    */

-   bind_buffer_object( ctx, GL_ARRAY_BUFFER_ARB, 0);

-   bind_buffer_object( ctx, GL_ELEMENT_ARRAY_BUFFER_ARB, 0);

-   bind_buffer_object( ctx, GL_PIXEL_PACK_BUFFER_ARB, 0);

-   bind_buffer_object( ctx, GL_PIXEL_UNPACK_BUFFER_ARB, 0);

-}

-

-

-

-/**

- * Return the gl_buffer_object for the given ID.

- * Always return NULL for ID 0.

- */

-struct gl_buffer_object *

-_mesa_lookup_bufferobj(struct gl_context *ctx, GLuint buffer)

-{

-   if (buffer == 0)

-      return NULL;

-   else

-      return (struct gl_buffer_object *)

-         _mesa_HashLookup(ctx->Shared->BufferObjects, buffer);

-}

-

-

-/**

- * If *ptr points to obj, set ptr = the Null/default buffer object.

- * This is a helper for buffer object deletion.

- * The GL spec says that deleting a buffer object causes it to get

- * unbound from all arrays in the current context.

- */

-static void

-unbind(struct gl_context *ctx,

-       struct gl_buffer_object **ptr,

-       struct gl_buffer_object *obj)

-{

-   if (*ptr == obj) {

-      _mesa_reference_buffer_object(ctx, ptr, ctx->Shared->NullBufferObj);

-   }

-}

-

-

-/**

- * Plug default/fallback buffer object functions into the device

- * driver hooks.

- */

-void

-_mesa_init_buffer_object_functions(struct dd_function_table *driver)

-{

-   /* GL_ARB_vertex/pixel_buffer_object */

-   driver->NewBufferObject = _mesa_new_buffer_object;

-   driver->DeleteBuffer = _mesa_delete_buffer_object;

-   driver->BindBuffer = NULL;

-   driver->BufferData = _mesa_buffer_data;

-   driver->BufferSubData = _mesa_buffer_subdata;

-   driver->GetBufferSubData = _mesa_buffer_get_subdata;

-   driver->MapBuffer = _mesa_buffer_map;

-   driver->UnmapBuffer = _mesa_buffer_unmap;

-

-   /* GL_ARB_map_buffer_range */

-   driver->MapBufferRange = _mesa_buffer_map_range;

-   driver->FlushMappedBufferRange = _mesa_buffer_flush_mapped_range;

-

-   /* GL_ARB_copy_buffer */

-   driver->CopyBufferSubData = _mesa_copy_buffer_subdata;

-}

-

-

-

-/**********************************************************************/

-/* API Functions                                                      */

-/**********************************************************************/

-

-void GLAPIENTRY

-_mesa_BindBufferARB(GLenum target, GLuint buffer)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (MESA_VERBOSE & VERBOSE_API)

-      _mesa_debug(ctx, "glBindBuffer(%s, %u)\n",

-                  _mesa_lookup_enum_by_nr(target), buffer);

-

-   bind_buffer_object(ctx, target, buffer);

-}

-

-

-/**

- * Delete a set of buffer objects.

- * 

- * \param n      Number of buffer objects to delete.

- * \param ids    Array of \c n buffer object IDs.

- */

-void GLAPIENTRY

-_mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLsizei i;

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-   FLUSH_VERTICES(ctx, 0);

-

-   if (n < 0) {

-      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteBuffersARB(n)");

-      return;

-   }

-

-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

-

-   for (i = 0; i < n; i++) {

-      struct gl_buffer_object *bufObj = _mesa_lookup_bufferobj(ctx, ids[i]);

-      if (bufObj) {

-         struct gl_array_object *arrayObj = ctx->Array.ArrayObj;

-         GLuint j;

-

-         ASSERT(bufObj->Name == ids[i] || bufObj == &DummyBufferObject);

-

-         if (_mesa_bufferobj_mapped(bufObj)) {

-            /* if mapped, unmap it now */

-            ctx->Driver.UnmapBuffer(ctx, 0, bufObj);

-            bufObj->AccessFlags = DEFAULT_ACCESS;

-            bufObj->Pointer = NULL;

-         }

-

-         /* unbind any vertex pointers bound to this buffer */

-         unbind(ctx, &arrayObj->Vertex.BufferObj, bufObj);

-         unbind(ctx, &arrayObj->Weight.BufferObj, bufObj);

-         unbind(ctx, &arrayObj->Normal.BufferObj, bufObj);

-         unbind(ctx, &arrayObj->Color.BufferObj, bufObj);

-         unbind(ctx, &arrayObj->SecondaryColor.BufferObj, bufObj);

-         unbind(ctx, &arrayObj->FogCoord.BufferObj, bufObj);

-         unbind(ctx, &arrayObj->Index.BufferObj, bufObj);

-         unbind(ctx, &arrayObj->EdgeFlag.BufferObj, bufObj);

-         for (j = 0; j < Elements(arrayObj->TexCoord); j++) {

-            unbind(ctx, &arrayObj->TexCoord[j].BufferObj, bufObj);

-         }

-         for (j = 0; j < Elements(arrayObj->VertexAttrib); j++) {

-            unbind(ctx, &arrayObj->VertexAttrib[j].BufferObj, bufObj);

-         }

-

-         if (ctx->Array.ArrayBufferObj == bufObj) {

-            _mesa_BindBufferARB( GL_ARRAY_BUFFER_ARB, 0 );

-         }

-         if (ctx->Array.ElementArrayBufferObj == bufObj) {

-            _mesa_BindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );

-         }

-

-         /* unbind any pixel pack/unpack pointers bound to this buffer */

-         if (ctx->Pack.BufferObj == bufObj) {

-            _mesa_BindBufferARB( GL_PIXEL_PACK_BUFFER_EXT, 0 );

-         }

-         if (ctx->Unpack.BufferObj == bufObj) {

-            _mesa_BindBufferARB( GL_PIXEL_UNPACK_BUFFER_EXT, 0 );

-         }

-

-         /* The ID is immediately freed for re-use */

-         _mesa_HashRemove(ctx->Shared->BufferObjects, ids[i]);

-         _mesa_reference_buffer_object(ctx, &bufObj, NULL);

-      }

-   }

-

-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

-}

-

-

-/**

- * Generate a set of unique buffer object IDs and store them in \c buffer.

- * 

- * \param n       Number of IDs to generate.

- * \param buffer  Array of \c n locations to store the IDs.

- */

-void GLAPIENTRY

-_mesa_GenBuffersARB(GLsizei n, GLuint *buffer)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint first;

-   GLint i;

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (MESA_VERBOSE & VERBOSE_API)

-      _mesa_debug(ctx, "glGenBuffers(%d)\n", n);

-

-   if (n < 0) {

-      _mesa_error(ctx, GL_INVALID_VALUE, "glGenBuffersARB");

-      return;

-   }

-

-   if (!buffer) {

-      return;

-   }

-

-   /*

-    * This must be atomic (generation and allocation of buffer object IDs)

-    */

-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

-

-   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->BufferObjects, n);

-

-   /* Insert the ID and pointer to dummy buffer object into hash table */

-   for (i = 0; i < n; i++) {

-      _mesa_HashInsert(ctx->Shared->BufferObjects, first + i,

-                       &DummyBufferObject);

-      buffer[i] = first + i;

-   }

-

-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

-}

-

-

-/**

- * Determine if ID is the name of a buffer object.

- * 

- * \param id  ID of the potential buffer object.

- * \return  \c GL_TRUE if \c id is the name of a buffer object, 

- *          \c GL_FALSE otherwise.

- */

-GLboolean GLAPIENTRY

-_mesa_IsBufferARB(GLuint id)

-{

-   struct gl_buffer_object *bufObj;

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

-

-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

-   bufObj = _mesa_lookup_bufferobj(ctx, id);

-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

-

-   return bufObj && bufObj != &DummyBufferObject;

-}

-

-

-void GLAPIENTRY

-_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,

-                    const GLvoid * data, GLenum usage)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   struct gl_buffer_object *bufObj;

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (MESA_VERBOSE & VERBOSE_API)

-      _mesa_debug(ctx, "glBufferData(%s, %ld, %p, %s)\n",

-                  _mesa_lookup_enum_by_nr(target),

-                  (long int) size, data,

-                  _mesa_lookup_enum_by_nr(usage));

-

-   if (size < 0) {

-      _mesa_error(ctx, GL_INVALID_VALUE, "glBufferDataARB(size < 0)");

-      return;

-   }

-

-   switch (usage) {

-   case GL_STREAM_DRAW_ARB:

-   case GL_STREAM_READ_ARB:

-   case GL_STREAM_COPY_ARB:

-   case GL_STATIC_DRAW_ARB:

-   case GL_STATIC_READ_ARB:

-   case GL_STATIC_COPY_ARB:

-   case GL_DYNAMIC_DRAW_ARB:

-   case GL_DYNAMIC_READ_ARB:

-   case GL_DYNAMIC_COPY_ARB:

-      /* OK */

-      break;

-   default:

-      _mesa_error(ctx, GL_INVALID_ENUM, "glBufferDataARB(usage)");

-      return;

-   }

-

-   bufObj = get_buffer(ctx, target);

-   if (!bufObj) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glBufferDataARB(target)" );

-      return;

-   }

-   if (!_mesa_is_bufferobj(bufObj)) {

-      _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferDataARB(buffer 0)" );

-      return;

-   }

-   

-   if (_mesa_bufferobj_mapped(bufObj)) {

-      /* Unmap the existing buffer.  We'll replace it now.  Not an error. */

-      ctx->Driver.UnmapBuffer(ctx, target, bufObj);

-      bufObj->AccessFlags = DEFAULT_ACCESS;

-      ASSERT(bufObj->Pointer == NULL);

-   }  

-

-   FLUSH_VERTICES(ctx, _NEW_BUFFER_OBJECT);

-

-   bufObj->Written = GL_TRUE;

-

-#ifdef VBO_DEBUG

-   printf("glBufferDataARB(%u, sz %ld, from %p, usage 0x%x)\n",

-                bufObj->Name, size, data, usage);

-#endif

-

-#ifdef BOUNDS_CHECK

-   size += 100;

-#endif

-

-   ASSERT(ctx->Driver.BufferData);

-   if (!ctx->Driver.BufferData( ctx, target, size, data, usage, bufObj )) {

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBufferDataARB()");

-   }

-}

-

-

-void GLAPIENTRY

-_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset,

-                       GLsizeiptrARB size, const GLvoid * data)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   struct gl_buffer_object *bufObj;

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   bufObj = buffer_object_subdata_range_good( ctx, target, offset, size,

-                                              "glBufferSubDataARB" );

-   if (!bufObj) {

-      /* error already recorded */

-      return;

-   }

-

-   if (size == 0)

-      return;

-

-   bufObj->Written = GL_TRUE;

-

-   ASSERT(ctx->Driver.BufferSubData);

-   ctx->Driver.BufferSubData( ctx, target, offset, size, data, bufObj );

-}

-

-

-void GLAPIENTRY

-_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset,

-                          GLsizeiptrARB size, void * data)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   struct gl_buffer_object *bufObj;

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   bufObj = buffer_object_subdata_range_good( ctx, target, offset, size,

-                                              "glGetBufferSubDataARB" );

-   if (!bufObj) {

-      /* error already recorded */

-      return;

-   }

-

-   ASSERT(ctx->Driver.GetBufferSubData);

-   ctx->Driver.GetBufferSubData( ctx, target, offset, size, data, bufObj );

-}

-

-

-void * GLAPIENTRY

-_mesa_MapBufferARB(GLenum target, GLenum access)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   struct gl_buffer_object * bufObj;

-   GLbitfield accessFlags;

-   void *map;

-

-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);

-

-   switch (access) {

-   case GL_READ_ONLY_ARB:

-      accessFlags = GL_MAP_READ_BIT;

-      break;

-   case GL_WRITE_ONLY_ARB:

-      accessFlags = GL_MAP_WRITE_BIT;

-      break;

-   case GL_READ_WRITE_ARB:

-      accessFlags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;

-      break;

-   default:

-      _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(access)");

-      return NULL;

-   }

-

-   bufObj = get_buffer(ctx, target);

-   if (!bufObj) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(target)" );

-      return NULL;

-   }

-   if (!_mesa_is_bufferobj(bufObj)) {

-      _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(buffer 0)" );

-      return NULL;

-   }

-   if (_mesa_bufferobj_mapped(bufObj)) {

-      _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(already mapped)");

-      return NULL;

-   }

-

-   ASSERT(ctx->Driver.MapBuffer);

-   map = ctx->Driver.MapBuffer( ctx, target, access, bufObj );

-   if (!map) {

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(map failed)");

-      return NULL;

-   }

-   else {

-      /* The driver callback should have set these fields.

-       * This is important because other modules (like VBO) might call

-       * the driver function directly.

-       */

-      ASSERT(bufObj->Pointer == map);

-      ASSERT(bufObj->Length == bufObj->Size);

-      ASSERT(bufObj->Offset == 0);

-      bufObj->AccessFlags = accessFlags;

-   }

-

-   if (access == GL_WRITE_ONLY_ARB || access == GL_READ_WRITE_ARB)

-      bufObj->Written = GL_TRUE;

-

-#ifdef VBO_DEBUG

-   printf("glMapBufferARB(%u, sz %ld, access 0x%x)\n",

-	  bufObj->Name, bufObj->Size, access);

-   if (access == GL_WRITE_ONLY_ARB) {

-      GLuint i;

-      GLubyte *b = (GLubyte *) bufObj->Pointer;

-      for (i = 0; i < bufObj->Size; i++)

-         b[i] = i & 0xff;

-   }

-#endif

-

-#ifdef BOUNDS_CHECK

-   {

-      GLubyte *buf = (GLubyte *) bufObj->Pointer;

-      GLuint i;

-      /* buffer is 100 bytes larger than requested, fill with magic value */

-      for (i = 0; i < 100; i++) {

-         buf[bufObj->Size - i - 1] = 123;

-      }

-   }

-#endif

-

-   return bufObj->Pointer;

-}

-

-

-GLboolean GLAPIENTRY

-_mesa_UnmapBufferARB(GLenum target)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   struct gl_buffer_object *bufObj;

-   GLboolean status = GL_TRUE;

-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

-

-   bufObj = get_buffer(ctx, target);

-   if (!bufObj) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glUnmapBufferARB(target)" );

-      return GL_FALSE;

-   }

-   if (!_mesa_is_bufferobj(bufObj)) {

-      _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB" );

-      return GL_FALSE;

-   }

-   if (!_mesa_bufferobj_mapped(bufObj)) {

-      _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB");

-      return GL_FALSE;

-   }

-

-#ifdef BOUNDS_CHECK

-   if (bufObj->Access != GL_READ_ONLY_ARB) {

-      GLubyte *buf = (GLubyte *) bufObj->Pointer;

-      GLuint i;

-      /* check that last 100 bytes are still = magic value */

-      for (i = 0; i < 100; i++) {

-         GLuint pos = bufObj->Size - i - 1;

-         if (buf[pos] != 123) {

-            _mesa_warning(ctx, "Out of bounds buffer object write detected"

-                          " at position %d (value = %u)\n",

-                          pos, buf[pos]);

-         }

-      }

-   }

-#endif

-

-#ifdef VBO_DEBUG

-   if (bufObj->AccessFlags & GL_MAP_WRITE_BIT) {

-      GLuint i, unchanged = 0;

-      GLubyte *b = (GLubyte *) bufObj->Pointer;

-      GLint pos = -1;

-      /* check which bytes changed */

-      for (i = 0; i < bufObj->Size - 1; i++) {

-         if (b[i] == (i & 0xff) && b[i+1] == ((i+1) & 0xff)) {

-            unchanged++;

-            if (pos == -1)

-               pos = i;

-         }

-      }

-      if (unchanged) {

-         printf("glUnmapBufferARB(%u): %u of %ld unchanged, starting at %d\n",

-                      bufObj->Name, unchanged, bufObj->Size, pos);

-      }

-   }

-#endif

-

-   status = ctx->Driver.UnmapBuffer( ctx, target, bufObj );

-   bufObj->AccessFlags = DEFAULT_ACCESS;

-   ASSERT(bufObj->Pointer == NULL);

-   ASSERT(bufObj->Offset == 0);

-   ASSERT(bufObj->Length == 0);

-

-   return status;

-}

-

-

-void GLAPIENTRY

-_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   struct gl_buffer_object *bufObj;

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   bufObj = get_buffer(ctx, target);

-   if (!bufObj) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(target)" );

-      return;

-   }

-   if (!_mesa_is_bufferobj(bufObj)) {

-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferParameterivARB" );

-      return;

-   }

-

-   switch (pname) {

-   case GL_BUFFER_SIZE_ARB:

-      *params = (GLint) bufObj->Size;

-      return;

-   case GL_BUFFER_USAGE_ARB:

-      *params = bufObj->Usage;

-      return;

-   case GL_BUFFER_ACCESS_ARB:

-      *params = simplified_access_mode(bufObj->AccessFlags);

-      return;

-   case GL_BUFFER_MAPPED_ARB:

-      *params = _mesa_bufferobj_mapped(bufObj);

-      return;

-   case GL_BUFFER_ACCESS_FLAGS:

-      if (ctx->VersionMajor < 3)

-         goto invalid_pname;

-      *params = bufObj->AccessFlags;

-      return;

-   case GL_BUFFER_MAP_OFFSET:

-      if (ctx->VersionMajor < 3)

-         goto invalid_pname;

-      *params = (GLint) bufObj->Offset;

-      return;

-   case GL_BUFFER_MAP_LENGTH:

-      if (ctx->VersionMajor < 3)

-         goto invalid_pname;

-      *params = (GLint) bufObj->Length;

-      return;

-   default:

-      ; /* fall-through */

-   }

-

-invalid_pname:

-   _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(pname=%s)",

-               _mesa_lookup_enum_by_nr(pname));

-}

-

-

-/**

- * New in GL 3.2

- * This is pretty much a duplicate of GetBufferParameteriv() but the

- * GL_BUFFER_SIZE_ARB attribute will be 64-bits on a 64-bit system.

- */

-void GLAPIENTRY

-_mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   struct gl_buffer_object *bufObj;

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   bufObj = get_buffer(ctx, target);

-   if (!bufObj) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(target)" );

-      return;

-   }

-   if (!_mesa_is_bufferobj(bufObj)) {

-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferParameteri64v" );

-      return;

-   }

-

-   switch (pname) {

-   case GL_BUFFER_SIZE_ARB:

-      *params = bufObj->Size;

-      return;

-   case GL_BUFFER_USAGE_ARB:

-      *params = bufObj->Usage;

-      return;

-   case GL_BUFFER_ACCESS_ARB:

-      *params = simplified_access_mode(bufObj->AccessFlags);

-      return;

-   case GL_BUFFER_ACCESS_FLAGS:

-      if (ctx->VersionMajor < 3)

-         goto invalid_pname;

-      *params = bufObj->AccessFlags;

-      return;

-   case GL_BUFFER_MAPPED_ARB:

-      *params = _mesa_bufferobj_mapped(bufObj);

-      return;

-   case GL_BUFFER_MAP_OFFSET:

-      if (ctx->VersionMajor < 3)

-         goto invalid_pname;

-      *params = bufObj->Offset;

-      return;

-   case GL_BUFFER_MAP_LENGTH:

-      if (ctx->VersionMajor < 3)

-         goto invalid_pname;

-      *params = bufObj->Length;

-      return;

-   default:

-      ; /* fall-through */

-   }

-

-invalid_pname:

-   _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(pname=%s)",

-               _mesa_lookup_enum_by_nr(pname));

-}

-

-

-void GLAPIENTRY

-_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   struct gl_buffer_object * bufObj;

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (pname != GL_BUFFER_MAP_POINTER_ARB) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferPointervARB(pname)");

-      return;

-   }

-

-   bufObj = get_buffer(ctx, target);

-   if (!bufObj) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferPointervARB(target)" );

-      return;

-   }

-   if (!_mesa_is_bufferobj(bufObj)) {

-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferPointervARB" );

-      return;

-   }

-

-   *params = bufObj->Pointer;

-}

-

-

-void GLAPIENTRY

-_mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,

-                        GLintptr readOffset, GLintptr writeOffset,

-                        GLsizeiptr size)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   struct gl_buffer_object *src, *dst;

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   src = get_buffer(ctx, readTarget);

-   if (!src || !_mesa_is_bufferobj(src)) {

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glCopyBuffserSubData(readTarget = 0x%x)", readTarget);

-      return;

-   }

-

-   dst = get_buffer(ctx, writeTarget);

-   if (!dst || !_mesa_is_bufferobj(dst)) {

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glCopyBuffserSubData(writeTarget = 0x%x)", writeTarget);

-      return;

-   }

-

-   if (_mesa_bufferobj_mapped(src)) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glCopyBuffserSubData(readBuffer is mapped)");

-      return;

-   }

-

-   if (_mesa_bufferobj_mapped(dst)) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glCopyBuffserSubData(writeBuffer is mapped)");

-      return;

-   }

-

-   if (readOffset < 0) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glCopyBuffserSubData(readOffset = %d)", (int) readOffset);

-      return;

-   }

-

-   if (writeOffset < 0) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glCopyBuffserSubData(writeOffset = %d)", (int) writeOffset);

-      return;

-   }

-

-   if (readOffset + size > src->Size) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glCopyBuffserSubData(readOffset + size = %d)",

-                  (int) (readOffset + size));

-      return;

-   }

-

-   if (writeOffset + size > dst->Size) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glCopyBuffserSubData(writeOffset + size = %d)",

-                  (int) (writeOffset + size));

-      return;

-   }

-

-   if (src == dst) {

-      if (readOffset + size <= writeOffset) {

-         /* OK */

-      }

-      else if (writeOffset + size <= readOffset) {

-         /* OK */

-      }

-      else {

-         /* overlapping src/dst is illegal */

-         _mesa_error(ctx, GL_INVALID_VALUE,

-                     "glCopyBuffserSubData(overlapping src/dst)");

-         return;

-      }

-   }

-

-   ctx->Driver.CopyBufferSubData(ctx, src, dst, readOffset, writeOffset, size);

-}

-

-

-/**

- * See GL_ARB_map_buffer_range spec

- */

-void * GLAPIENTRY

-_mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,

-                     GLbitfield access)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   struct gl_buffer_object *bufObj;

-   void *map;

-

-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);

-

-   if (!ctx->Extensions.ARB_map_buffer_range) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glMapBufferRange(extension not supported)");

-      return NULL;

-   }

-

-   if (offset < 0) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glMapBufferRange(offset = %ld)", (long)offset);

-      return NULL;

-   }

-

-   if (length < 0) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glMapBufferRange(length = %ld)", (long)length);

-      return NULL;

-   }

-

-   if ((access & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)) == 0) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glMapBufferRange(access indicates neither read or write)");

-      return NULL;

-   }

-

-   if ((access & GL_MAP_READ_BIT) &&

-       (access & (GL_MAP_INVALIDATE_RANGE_BIT |

-                  GL_MAP_INVALIDATE_BUFFER_BIT |

-                  GL_MAP_UNSYNCHRONIZED_BIT))) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glMapBufferRange(invalid access flags)");

-      return NULL;

-   }

-

-   if ((access & GL_MAP_FLUSH_EXPLICIT_BIT) &&

-       ((access & GL_MAP_WRITE_BIT) == 0)) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glMapBufferRange(invalid access flags)");

-      return NULL;

-   }

-

-   bufObj = get_buffer(ctx, target);

-   if (!bufObj || !_mesa_is_bufferobj(bufObj)) {

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glMapBufferRange(target = 0x%x)", target);

-      return NULL;

-   }

-

-   if (offset + length > bufObj->Size) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glMapBufferRange(offset + length > size)");

-      return NULL;

-   }

-

-   if (_mesa_bufferobj_mapped(bufObj)) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glMapBufferRange(buffer already mapped)");

-      return NULL;

-   }

-      

-   ASSERT(ctx->Driver.MapBufferRange);

-   map = ctx->Driver.MapBufferRange(ctx, target, offset, length,

-                                    access, bufObj);

-   if (!map) {

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(map failed)");

-   }

-   else {

-      /* The driver callback should have set all these fields.

-       * This is important because other modules (like VBO) might call

-       * the driver function directly.

-       */

-      ASSERT(bufObj->Pointer == map);

-      ASSERT(bufObj->Length == length);

-      ASSERT(bufObj->Offset == offset);

-      ASSERT(bufObj->AccessFlags == access);

-   }

-

-   return map;

-}

-

-

-/**

- * See GL_ARB_map_buffer_range spec

- */

-void GLAPIENTRY

-_mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   struct gl_buffer_object *bufObj;

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (!ctx->Extensions.ARB_map_buffer_range) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glMapBufferRange(extension not supported)");

-      return;

-   }

-

-   if (offset < 0) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glMapBufferRange(offset = %ld)", (long)offset);

-      return;

-   }

-

-   if (length < 0) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glMapBufferRange(length = %ld)", (long)length);

-      return;

-   }

-

-   bufObj = get_buffer(ctx, target);

-   if (!bufObj) {

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glMapBufferRange(target = 0x%x)", target);

-      return;

-   }

-

-   if (!_mesa_is_bufferobj(bufObj)) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glMapBufferRange(current buffer is 0)");

-      return;

-   }

-

-   if (!_mesa_bufferobj_mapped(bufObj)) {

-      /* buffer is not mapped */

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glMapBufferRange(buffer is not mapped)");

-      return;

-   }

-

-   if ((bufObj->AccessFlags & GL_MAP_FLUSH_EXPLICIT_BIT) == 0) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glMapBufferRange(GL_MAP_FLUSH_EXPLICIT_BIT not set)");

-      return;

-   }

-

-   if (offset + length > bufObj->Length) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-		  "glMapBufferRange(offset %ld + length %ld > mapped length %ld)",

-		  (long)offset, (long)length, (long)bufObj->Length);

-      return;

-   }

-

-   ASSERT(bufObj->AccessFlags & GL_MAP_WRITE_BIT);

-

-   if (ctx->Driver.FlushMappedBufferRange)

-      ctx->Driver.FlushMappedBufferRange(ctx, target, offset, length, bufObj);

-}

-

-

-#if FEATURE_APPLE_object_purgeable

-static GLenum

-buffer_object_purgeable(struct gl_context *ctx, GLuint name, GLenum option)

-{

-   struct gl_buffer_object *bufObj;

-   GLenum retval;

-

-   bufObj = _mesa_lookup_bufferobj(ctx, name);

-   if (!bufObj) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glObjectPurgeable(name = 0x%x)", name);

-      return 0;

-   }

-   if (!_mesa_is_bufferobj(bufObj)) {

-      _mesa_error(ctx, GL_INVALID_OPERATION, "glObjectPurgeable(buffer 0)" );

-      return 0;

-   }

-

-   if (bufObj->Purgeable) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glObjectPurgeable(name = 0x%x) is already purgeable", name);

-      return GL_VOLATILE_APPLE;

-   }

-

-   bufObj->Purgeable = GL_TRUE;

-

-   retval = GL_VOLATILE_APPLE;

-   if (ctx->Driver.BufferObjectPurgeable)

-      retval = ctx->Driver.BufferObjectPurgeable(ctx, bufObj, option);

-

-   return retval;

-}

-

-

-static GLenum

-renderbuffer_purgeable(struct gl_context *ctx, GLuint name, GLenum option)

-{

-   struct gl_renderbuffer *bufObj;

-   GLenum retval;

-

-   bufObj = _mesa_lookup_renderbuffer(ctx, name);

-   if (!bufObj) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glObjectUnpurgeable(name = 0x%x)", name);

-      return 0;

-   }

-

-   if (bufObj->Purgeable) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glObjectPurgeable(name = 0x%x) is already purgeable", name);

-      return GL_VOLATILE_APPLE;

-   }

-

-   bufObj->Purgeable = GL_TRUE;

-

-   retval = GL_VOLATILE_APPLE;

-   if (ctx->Driver.RenderObjectPurgeable)

-      retval = ctx->Driver.RenderObjectPurgeable(ctx, bufObj, option);

-

-   return retval;

-}

-

-

-static GLenum

-texture_object_purgeable(struct gl_context *ctx, GLuint name, GLenum option)

-{

-   struct gl_texture_object *bufObj;

-   GLenum retval;

-

-   bufObj = _mesa_lookup_texture(ctx, name);

-   if (!bufObj) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glObjectPurgeable(name = 0x%x)", name);

-      return 0;

-   }

-

-   if (bufObj->Purgeable) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glObjectPurgeable(name = 0x%x) is already purgeable", name);

-      return GL_VOLATILE_APPLE;

-   }

-

-   bufObj->Purgeable = GL_TRUE;

-

-   retval = GL_VOLATILE_APPLE;

-   if (ctx->Driver.TextureObjectPurgeable)

-      retval = ctx->Driver.TextureObjectPurgeable(ctx, bufObj, option);

-

-   return retval;

-}

-

-

-GLenum GLAPIENTRY

-_mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)

-{

-   GLenum retval;

-

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);

-

-   if (name == 0) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glObjectPurgeable(name = 0x%x)", name);

-      return 0;

-   }

-

-   switch (option) {

-   case GL_VOLATILE_APPLE:

-   case GL_RELEASED_APPLE:

-      /* legal */

-      break;

-   default:

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glObjectPurgeable(name = 0x%x) invalid option: %d",

-                  name, option);

-      return 0;

-   }

-

-   switch (objectType) {

-   case GL_TEXTURE:

-      retval = texture_object_purgeable(ctx, name, option);

-      break;

-   case GL_RENDERBUFFER_EXT:

-      retval = renderbuffer_purgeable(ctx, name, option);

-      break;

-   case GL_BUFFER_OBJECT_APPLE:

-      retval = buffer_object_purgeable(ctx, name, option);

-      break;

-   default:

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glObjectPurgeable(name = 0x%x) invalid type: %d",

-                  name, objectType);

-      return 0;

-   }

-

-   /* In strict conformance to the spec, we must only return VOLATILE when

-    * when passed the VOLATILE option. Madness.

-    *

-    * XXX First fix the spec, then fix me.

-    */

-   return option == GL_VOLATILE_APPLE ? GL_VOLATILE_APPLE : retval;

-}

-

-

-static GLenum

-buffer_object_unpurgeable(struct gl_context *ctx, GLuint name, GLenum option)

-{

-   struct gl_buffer_object *bufObj;

-   GLenum retval;

-

-   bufObj = _mesa_lookup_bufferobj(ctx, name);

-   if (!bufObj) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glObjectUnpurgeable(name = 0x%x)", name);

-      return 0;

-   }

-

-   if (! bufObj->Purgeable) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glObjectUnpurgeable(name = 0x%x) object is "

-                  " already \"unpurged\"", name);

-      return 0;

-   }

-

-   bufObj->Purgeable = GL_FALSE;

-

-   retval = option;

-   if (ctx->Driver.BufferObjectUnpurgeable)

-      retval = ctx->Driver.BufferObjectUnpurgeable(ctx, bufObj, option);

-

-   return retval;

-}

-

-

-static GLenum

-renderbuffer_unpurgeable(struct gl_context *ctx, GLuint name, GLenum option)

-{

-   struct gl_renderbuffer *bufObj;

-   GLenum retval;

-

-   bufObj = _mesa_lookup_renderbuffer(ctx, name);

-   if (!bufObj) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glObjectUnpurgeable(name = 0x%x)", name);

-      return 0;

-   }

-

-   if (! bufObj->Purgeable) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glObjectUnpurgeable(name = 0x%x) object is "

-                  " already \"unpurged\"", name);

-      return 0;

-   }

-

-   bufObj->Purgeable = GL_FALSE;

-

-   retval = option;

-   if (ctx->Driver.RenderObjectUnpurgeable)

-      retval = ctx->Driver.RenderObjectUnpurgeable(ctx, bufObj, option);

-

-   return retval;

-}

-

-

-static GLenum

-texture_object_unpurgeable(struct gl_context *ctx, GLuint name, GLenum option)

-{

-   struct gl_texture_object *bufObj;

-   GLenum retval;

-

-   bufObj = _mesa_lookup_texture(ctx, name);

-   if (!bufObj) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glObjectUnpurgeable(name = 0x%x)", name);

-      return 0;

-   }

-

-   if (! bufObj->Purgeable) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glObjectUnpurgeable(name = 0x%x) object is"

-                  " already \"unpurged\"", name);

-      return 0;

-   }

-

-   bufObj->Purgeable = GL_FALSE;

-

-   retval = option;

-   if (ctx->Driver.TextureObjectUnpurgeable)

-      retval = ctx->Driver.TextureObjectUnpurgeable(ctx, bufObj, option);

-

-   return retval;

-}

-

-

-GLenum GLAPIENTRY

-_mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);

-

-   if (name == 0) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glObjectUnpurgeable(name = 0x%x)", name);

-      return 0;

-   }

-

-   switch (option) {

-   case GL_RETAINED_APPLE:

-   case GL_UNDEFINED_APPLE:

-      /* legal */

-      break;

-   default:

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glObjectUnpurgeable(name = 0x%x) invalid option: %d",

-                  name, option);

-      return 0;

-   }

-

-   switch (objectType) {

-   case GL_BUFFER_OBJECT_APPLE:

-      return buffer_object_unpurgeable(ctx, name, option);

-   case GL_TEXTURE:

-      return texture_object_unpurgeable(ctx, name, option);

-   case GL_RENDERBUFFER_EXT:

-      return renderbuffer_unpurgeable(ctx, name, option);

-   default:

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glObjectUnpurgeable(name = 0x%x) invalid type: %d",

-                  name, objectType);

-      return 0;

-   }

-}

-

-

-static void

-get_buffer_object_parameteriv(struct gl_context *ctx, GLuint name,

-                              GLenum pname, GLint *params)

-{

-   struct gl_buffer_object *bufObj = _mesa_lookup_bufferobj(ctx, name);

-   if (!bufObj) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glGetObjectParameteriv(name = 0x%x) invalid object", name);

-      return;

-   }

-

-   switch (pname) {

-   case GL_PURGEABLE_APPLE:

-      *params = bufObj->Purgeable;

-      break;

-   default:

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d",

-                  name, pname);

-      break;

-   }

-}

-

-

-static void

-get_renderbuffer_parameteriv(struct gl_context *ctx, GLuint name,

-                             GLenum pname, GLint *params)

-{

-   struct gl_renderbuffer *rb = _mesa_lookup_renderbuffer(ctx, name);

-   if (!rb) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glObjectUnpurgeable(name = 0x%x)", name);

-      return;

-   }

-

-   switch (pname) {

-   case GL_PURGEABLE_APPLE:

-      *params = rb->Purgeable;

-      break;

-   default:

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d",

-                  name, pname);

-      break;

-   }

-}

-

-

-static void

-get_texture_object_parameteriv(struct gl_context *ctx, GLuint name,

-                               GLenum pname, GLint *params)

-{

-   struct gl_texture_object *texObj = _mesa_lookup_texture(ctx, name);

-   if (!texObj) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glObjectUnpurgeable(name = 0x%x)", name);

-      return;

-   }

-

-   switch (pname) {

-   case GL_PURGEABLE_APPLE:

-      *params = texObj->Purgeable;

-      break;

-   default:

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d",

-                  name, pname);

-      break;

-   }

-}

-

-

-void GLAPIENTRY

-_mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname,

-                                GLint *params)

-{

-   GET_CURRENT_CONTEXT(ctx);

-

-   if (name == 0) {

-      _mesa_error(ctx, GL_INVALID_VALUE,

-                  "glGetObjectParameteriv(name = 0x%x)", name);

-      return;

-   }

-

-   switch (objectType) {

-   case GL_TEXTURE:

-      get_texture_object_parameteriv(ctx, name, pname, params);

-      break;

-   case GL_BUFFER_OBJECT_APPLE:

-      get_buffer_object_parameteriv(ctx, name, pname, params);

-      break;

-   case GL_RENDERBUFFER_EXT:

-      get_renderbuffer_parameteriv(ctx, name, pname, params);

-      break;

-   default:

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glGetObjectParameteriv(name = 0x%x) invalid type: %d",

-                  name, objectType);

-   }

-}

-

-#endif /* FEATURE_APPLE_object_purgeable */

+/*
+ * Mesa 3-D graphics library
+ * Version:  7.6
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \file bufferobj.c
+ * \brief Functions for the GL_ARB_vertex/pixel_buffer_object extensions.
+ * \author Brian Paul, Ian Romanick
+ */
+
+
+#include "glheader.h"
+#include "enums.h"
+#include "hash.h"
+#include "imports.h"
+#include "image.h"
+#include "context.h"
+#include "bufferobj.h"
+#include "fbobject.h"
+#include "mfeatures.h"
+#include "mtypes.h"
+#include "texobj.h"
+
+
+/* Debug flags */
+/*#define VBO_DEBUG*/
+/*#define BOUNDS_CHECK*/
+
+
+#if FEATURE_OES_mapbuffer
+#define DEFAULT_ACCESS GL_MAP_WRITE_BIT
+#else
+#define DEFAULT_ACCESS (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)
+#endif
+
+
+/**
+ * Used as a placeholder for buffer objects between glGenBuffers() and
+ * glBindBuffer() so that glIsBuffer() can work correctly.
+ */
+static struct gl_buffer_object DummyBufferObject;
+
+
+/**
+ * Return pointer to address of a buffer object target.
+ * \param ctx  the GL context
+ * \param target  the buffer object target to be retrieved.
+ * \return   pointer to pointer to the buffer object bound to \c target in the
+ *           specified context or \c NULL if \c target is invalid.
+ */
+static INLINE struct gl_buffer_object **
+get_buffer_target(struct gl_context *ctx, GLenum target)
+{
+   switch (target) {
+   case GL_ARRAY_BUFFER_ARB:
+      return &ctx->Array.ArrayBufferObj;
+   case GL_ELEMENT_ARRAY_BUFFER_ARB:
+      return &ctx->Array.ElementArrayBufferObj;
+   case GL_PIXEL_PACK_BUFFER_EXT:
+      return &ctx->Pack.BufferObj;
+   case GL_PIXEL_UNPACK_BUFFER_EXT:
+      return &ctx->Unpack.BufferObj;
+   case GL_COPY_READ_BUFFER:
+      return &ctx->CopyReadBuffer;
+   case GL_COPY_WRITE_BUFFER:
+      return &ctx->CopyWriteBuffer;
+#if FEATURE_EXT_transform_feedback
+   case GL_TRANSFORM_FEEDBACK_BUFFER:
+      if (ctx->Extensions.EXT_transform_feedback) {
+         return &ctx->TransformFeedback.CurrentBuffer;
+      }
+      break;
+#endif
+   case GL_TEXTURE_BUFFER:
+      if (ctx->Extensions.ARB_texture_buffer_object) {
+         return &ctx->Texture.BufferObject;
+      }
+      break;
+   default:
+      return NULL;
+   }
+   return NULL;
+}
+
+
+/**
+ * Get the buffer object bound to the specified target in a GL context.
+ * \param ctx  the GL context
+ * \param target  the buffer object target to be retrieved.
+ * \return   pointer to the buffer object bound to \c target in the
+ *           specified context or \c NULL if \c target is invalid.
+ */
+static INLINE struct gl_buffer_object *
+get_buffer(struct gl_context *ctx, GLenum target)
+{
+   struct gl_buffer_object **bufObj = get_buffer_target(ctx, target);
+   if (bufObj)
+      return *bufObj;
+   return NULL;
+}
+
+
+/**
+ * Convert a GLbitfield describing the mapped buffer access flags
+ * into one of GL_READ_WRITE, GL_READ_ONLY, or GL_WRITE_ONLY.
+ */
+static GLenum
+simplified_access_mode(GLbitfield access)
+{
+   const GLbitfield rwFlags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;
+   if ((access & rwFlags) == rwFlags)
+      return GL_READ_WRITE;
+   if ((access & GL_MAP_READ_BIT) == GL_MAP_READ_BIT)
+      return GL_READ_ONLY;
+   if ((access & GL_MAP_WRITE_BIT) == GL_MAP_WRITE_BIT)
+      return GL_WRITE_ONLY;
+   return GL_READ_WRITE; /* this should never happen, but no big deal */
+}
+
+
+/**
+ * Tests the subdata range parameters and sets the GL error code for
+ * \c glBufferSubDataARB and \c glGetBufferSubDataARB.
+ *
+ * \param ctx     GL context.
+ * \param target  Buffer object target on which to operate.
+ * \param offset  Offset of the first byte of the subdata range.
+ * \param size    Size, in bytes, of the subdata range.
+ * \param caller  Name of calling function for recording errors.
+ * \return   A pointer to the buffer object bound to \c target in the
+ *           specified context or \c NULL if any of the parameter or state
+ *           conditions for \c glBufferSubDataARB or \c glGetBufferSubDataARB
+ *           are invalid.
+ *
+ * \sa glBufferSubDataARB, glGetBufferSubDataARB
+ */
+static struct gl_buffer_object *
+buffer_object_subdata_range_good( struct gl_context * ctx, GLenum target, 
+                                  GLintptrARB offset, GLsizeiptrARB size,
+                                  const char *caller )
+{
+   struct gl_buffer_object *bufObj;
+
+   if (size < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(size < 0)", caller);
+      return NULL;
+   }
+
+   if (offset < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(offset < 0)", caller);
+      return NULL;
+   }
+
+   bufObj = get_buffer(ctx, target);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(target)", caller);
+      return NULL;
+   }
+   if (!_mesa_is_bufferobj(bufObj)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
+      return NULL;
+   }
+   if (offset + size > bufObj->Size) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+		  "%s(size + offset > buffer size)", caller);
+      return NULL;
+   }
+   if (_mesa_bufferobj_mapped(bufObj)) {
+      /* Buffer is currently mapped */
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
+      return NULL;
+   }
+
+   return bufObj;
+}
+
+
+/**
+ * Allocate and initialize a new buffer object.
+ * 
+ * Default callback for the \c dd_function_table::NewBufferObject() hook.
+ */
+struct gl_buffer_object *
+_mesa_new_buffer_object( struct gl_context *ctx, GLuint name, GLenum target )
+{
+   struct gl_buffer_object *obj;
+
+   (void) ctx;
+
+   obj = MALLOC_STRUCT(gl_buffer_object);
+   _mesa_initialize_buffer_object(obj, name, target);
+   return obj;
+}
+
+
+/**
+ * Delete a buffer object.
+ * 
+ * Default callback for the \c dd_function_table::DeleteBuffer() hook.
+ */
+void
+_mesa_delete_buffer_object(struct gl_context *ctx,
+                           struct gl_buffer_object *bufObj)
+{
+   (void) ctx;
+
+   if (bufObj->Data)
+      free(bufObj->Data);
+
+   /* assign strange values here to help w/ debugging */
+   bufObj->RefCount = -1000;
+   bufObj->Name = ~0;
+
+   _glthread_DESTROY_MUTEX(bufObj->Mutex);
+   free(bufObj);
+}
+
+
+
+/**
+ * Set ptr to bufObj w/ reference counting.
+ * This is normally only called from the _mesa_reference_buffer_object() macro
+ * when there's a real pointer change.
+ */
+void
+_mesa_reference_buffer_object_(struct gl_context *ctx,
+                               struct gl_buffer_object **ptr,
+                               struct gl_buffer_object *bufObj)
+{
+   if (*ptr) {
+      /* Unreference the old buffer */
+      GLboolean deleteFlag = GL_FALSE;
+      struct gl_buffer_object *oldObj = *ptr;
+
+      _glthread_LOCK_MUTEX(oldObj->Mutex);
+      ASSERT(oldObj->RefCount > 0);
+      oldObj->RefCount--;
+#if 0
+      printf("BufferObj %p %d DECR to %d\n",
+             (void *) oldObj, oldObj->Name, oldObj->RefCount);
+#endif
+      deleteFlag = (oldObj->RefCount == 0);
+      _glthread_UNLOCK_MUTEX(oldObj->Mutex);
+
+      if (deleteFlag) {
+
+         /* some sanity checking: don't delete a buffer still in use */
+#if 0
+         /* unfortunately, these tests are invalid during context tear-down */
+	 ASSERT(ctx->Array.ArrayBufferObj != bufObj);
+	 ASSERT(ctx->Array.ElementArrayBufferObj != bufObj);
+	 ASSERT(ctx->Array.ArrayObj->Vertex.BufferObj != bufObj);
+#endif
+
+	 ASSERT(ctx->Driver.DeleteBuffer);
+         ctx->Driver.DeleteBuffer(ctx, oldObj);
+      }
+
+      *ptr = NULL;
+   }
+   ASSERT(!*ptr);
+
+   if (bufObj) {
+      /* reference new buffer */
+      _glthread_LOCK_MUTEX(bufObj->Mutex);
+      if (bufObj->RefCount == 0) {
+         /* this buffer's being deleted (look just above) */
+         /* Not sure this can every really happen.  Warn if it does. */
+         _mesa_problem(NULL, "referencing deleted buffer object");
+         *ptr = NULL;
+      }
+      else {
+         bufObj->RefCount++;
+#if 0
+         printf("BufferObj %p %d INCR to %d\n",
+                (void *) bufObj, bufObj->Name, bufObj->RefCount);
+#endif
+         *ptr = bufObj;
+      }
+      _glthread_UNLOCK_MUTEX(bufObj->Mutex);
+   }
+}
+
+
+/**
+ * Initialize a buffer object to default values.
+ */
+void
+_mesa_initialize_buffer_object( struct gl_buffer_object *obj,
+				GLuint name, GLenum target )
+{
+   (void) target;
+
+   memset(obj, 0, sizeof(struct gl_buffer_object));
+   _glthread_INIT_MUTEX(obj->Mutex);
+   obj->RefCount = 1;
+   obj->Name = name;
+   obj->Usage = GL_STATIC_DRAW_ARB;
+   obj->AccessFlags = DEFAULT_ACCESS;
+}
+
+
+/**
+ * Allocate space for and store data in a buffer object.  Any data that was
+ * previously stored in the buffer object is lost.  If \c data is \c NULL,
+ * memory will be allocated, but no copy will occur.
+ *
+ * This is the default callback for \c dd_function_table::BufferData()
+ * Note that all GL error checking will have been done already.
+ *
+ * \param ctx     GL context.
+ * \param target  Buffer object target on which to operate.
+ * \param size    Size, in bytes, of the new data store.
+ * \param data    Pointer to the data to store in the buffer object.  This
+ *                pointer may be \c NULL.
+ * \param usage   Hints about how the data will be used.
+ * \param bufObj  Object to be used.
+ *
+ * \return GL_TRUE for success, GL_FALSE for failure
+ * \sa glBufferDataARB, dd_function_table::BufferData.
+ */
+GLboolean
+_mesa_buffer_data( struct gl_context *ctx, GLenum target, GLsizeiptrARB size,
+		   const GLvoid * data, GLenum usage,
+		   struct gl_buffer_object * bufObj )
+{
+   void * new_data;
+
+   (void) ctx; (void) target;
+
+   new_data = _mesa_realloc( bufObj->Data, bufObj->Size, size );
+   if (new_data) {
+      bufObj->Data = (GLubyte *) new_data;
+      bufObj->Size = size;
+      bufObj->Usage = usage;
+
+      if (data) {
+	 memcpy( bufObj->Data, data, size );
+      }
+
+      return GL_TRUE;
+   }
+   else {
+      return GL_FALSE;
+   }
+}
+
+
+/**
+ * Replace data in a subrange of buffer object.  If the data range
+ * specified by \c size + \c offset extends beyond the end of the buffer or
+ * if \c data is \c NULL, no copy is performed.
+ *
+ * This is the default callback for \c dd_function_table::BufferSubData()
+ * Note that all GL error checking will have been done already.
+ *
+ * \param ctx     GL context.
+ * \param target  Buffer object target on which to operate.
+ * \param offset  Offset of the first byte to be modified.
+ * \param size    Size, in bytes, of the data range.
+ * \param data    Pointer to the data to store in the buffer object.
+ * \param bufObj  Object to be used.
+ *
+ * \sa glBufferSubDataARB, dd_function_table::BufferSubData.
+ */
+void
+_mesa_buffer_subdata( struct gl_context *ctx, GLenum target, GLintptrARB offset,
+		      GLsizeiptrARB size, const GLvoid * data,
+		      struct gl_buffer_object * bufObj )
+{
+   (void) ctx; (void) target;
+
+   /* this should have been caught in _mesa_BufferSubData() */
+   ASSERT(size + offset <= bufObj->Size);
+
+   if (bufObj->Data) {
+      memcpy( (GLubyte *) bufObj->Data + offset, data, size );
+   }
+}
+
+
+/**
+ * Retrieve data from a subrange of buffer object.  If the data range
+ * specified by \c size + \c offset extends beyond the end of the buffer or
+ * if \c data is \c NULL, no copy is performed.
+ *
+ * This is the default callback for \c dd_function_table::GetBufferSubData()
+ * Note that all GL error checking will have been done already.
+ *
+ * \param ctx     GL context.
+ * \param target  Buffer object target on which to operate.
+ * \param offset  Offset of the first byte to be fetched.
+ * \param size    Size, in bytes, of the data range.
+ * \param data    Destination for data
+ * \param bufObj  Object to be used.
+ *
+ * \sa glBufferGetSubDataARB, dd_function_table::GetBufferSubData.
+ */
+void
+_mesa_buffer_get_subdata( struct gl_context *ctx,
+                          GLenum target, GLintptrARB offset,
+			  GLsizeiptrARB size, GLvoid * data,
+			  struct gl_buffer_object * bufObj )
+{
+   (void) ctx; (void) target;
+
+   if (bufObj->Data && ((GLsizeiptrARB) (size + offset) <= bufObj->Size)) {
+      memcpy( data, (GLubyte *) bufObj->Data + offset, size );
+   }
+}
+
+
+/**
+ * Default callback for \c dd_function_tabel::MapBuffer().
+ *
+ * The function parameters will have been already tested for errors.
+ *
+ * \param ctx     GL context.
+ * \param target  Buffer object target on which to operate.
+ * \param access  Information about how the buffer will be accessed.
+ * \param bufObj  Object to be mapped.
+ * \return  A pointer to the object's internal data store that can be accessed
+ *          by the processor
+ *
+ * \sa glMapBufferARB, dd_function_table::MapBuffer
+ */
+void *
+_mesa_buffer_map( struct gl_context *ctx, GLenum target, GLenum access,
+		  struct gl_buffer_object *bufObj )
+{
+   (void) ctx;
+   (void) target;
+   (void) access;
+   /* Just return a direct pointer to the data */
+   if (_mesa_bufferobj_mapped(bufObj)) {
+      /* already mapped! */
+      return NULL;
+   }
+   bufObj->Pointer = bufObj->Data;
+   bufObj->Length = bufObj->Size;
+   bufObj->Offset = 0;
+   return bufObj->Pointer;
+}
+
+
+/**
+ * Default fallback for \c dd_function_table::MapBufferRange().
+ * Called via glMapBufferRange().
+ */
+static void *
+_mesa_buffer_map_range( struct gl_context *ctx, GLenum target, GLintptr offset,
+                        GLsizeiptr length, GLbitfield access,
+                        struct gl_buffer_object *bufObj )
+{
+   (void) ctx;
+   (void) target;
+   assert(!_mesa_bufferobj_mapped(bufObj));
+   /* Just return a direct pointer to the data */
+   bufObj->Pointer = bufObj->Data + offset;
+   bufObj->Length = length;
+   bufObj->Offset = offset;
+   bufObj->AccessFlags = access;
+   return bufObj->Pointer;
+}
+
+
+/**
+ * Default fallback for \c dd_function_table::FlushMappedBufferRange().
+ * Called via glFlushMappedBufferRange().
+ */
+static void
+_mesa_buffer_flush_mapped_range( struct gl_context *ctx, GLenum target, 
+                                 GLintptr offset, GLsizeiptr length,
+                                 struct gl_buffer_object *obj )
+{
+   (void) ctx;
+   (void) target;
+   (void) offset;
+   (void) length;
+   (void) obj;
+   /* no-op */
+}
+
+
+/**
+ * Default callback for \c dd_function_table::MapBuffer().
+ *
+ * The input parameters will have been already tested for errors.
+ *
+ * \sa glUnmapBufferARB, dd_function_table::UnmapBuffer
+ */
+GLboolean
+_mesa_buffer_unmap( struct gl_context *ctx, GLenum target,
+                    struct gl_buffer_object *bufObj )
+{
+   (void) ctx;
+   (void) target;
+   /* XXX we might assert here that bufObj->Pointer is non-null */
+   bufObj->Pointer = NULL;
+   bufObj->Length = 0;
+   bufObj->Offset = 0;
+   bufObj->AccessFlags = 0x0;
+   return GL_TRUE;
+}
+
+
+/**
+ * Default fallback for \c dd_function_table::CopyBufferSubData().
+ * Called via glCopyBuffserSubData().
+ */
+static void
+_mesa_copy_buffer_subdata(struct gl_context *ctx,
+                          struct gl_buffer_object *src,
+                          struct gl_buffer_object *dst,
+                          GLintptr readOffset, GLintptr writeOffset,
+                          GLsizeiptr size)
+{
+   GLubyte *srcPtr, *dstPtr;
+
+   /* buffer should not already be mapped */
+   assert(!_mesa_bufferobj_mapped(src));
+   assert(!_mesa_bufferobj_mapped(dst));
+
+   srcPtr = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_COPY_READ_BUFFER,
+                                              GL_READ_ONLY, src);
+   dstPtr = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_COPY_WRITE_BUFFER,
+                                              GL_WRITE_ONLY, dst);
+
+   if (srcPtr && dstPtr)
+      memcpy(dstPtr + writeOffset, srcPtr + readOffset, size);
+
+   ctx->Driver.UnmapBuffer(ctx, GL_COPY_READ_BUFFER, src);
+   ctx->Driver.UnmapBuffer(ctx, GL_COPY_WRITE_BUFFER, dst);
+}
+
+
+
+/**
+ * Initialize the state associated with buffer objects
+ */
+void
+_mesa_init_buffer_objects( struct gl_context *ctx )
+{
+   memset(&DummyBufferObject, 0, sizeof(DummyBufferObject));
+   _glthread_INIT_MUTEX(DummyBufferObject.Mutex);
+   DummyBufferObject.RefCount = 1000*1000*1000; /* never delete */
+
+   _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj,
+                                 ctx->Shared->NullBufferObj);
+   _mesa_reference_buffer_object(ctx, &ctx->Array.ElementArrayBufferObj,
+                                 ctx->Shared->NullBufferObj);
+
+   _mesa_reference_buffer_object(ctx, &ctx->CopyReadBuffer,
+                                 ctx->Shared->NullBufferObj);
+   _mesa_reference_buffer_object(ctx, &ctx->CopyWriteBuffer,
+                                 ctx->Shared->NullBufferObj);
+}
+
+
+void
+_mesa_free_buffer_objects( struct gl_context *ctx )
+{
+   _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj, NULL);
+   _mesa_reference_buffer_object(ctx, &ctx->Array.ElementArrayBufferObj, NULL);
+
+   _mesa_reference_buffer_object(ctx, &ctx->CopyReadBuffer, NULL);
+   _mesa_reference_buffer_object(ctx, &ctx->CopyWriteBuffer, NULL);
+}
+
+
+/**
+ * Bind the specified target to buffer for the specified context.
+ * Called by glBindBuffer() and other functions.
+ */
+static void
+bind_buffer_object(struct gl_context *ctx, GLenum target, GLuint buffer)
+{
+   struct gl_buffer_object *oldBufObj;
+   struct gl_buffer_object *newBufObj = NULL;
+   struct gl_buffer_object **bindTarget = NULL;
+
+   bindTarget = get_buffer_target(ctx, target);
+   if (!bindTarget) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferARB(target 0x%x)", target);
+      return;
+   }
+
+   /* Get pointer to old buffer object (to be unbound) */
+   oldBufObj = *bindTarget;
+   if (oldBufObj && oldBufObj->Name == buffer)
+      return;   /* rebinding the same buffer object- no change */
+
+   /*
+    * Get pointer to new buffer object (newBufObj)
+    */
+   if (buffer == 0) {
+      /* The spec says there's not a buffer object named 0, but we use
+       * one internally because it simplifies things.
+       */
+      newBufObj = ctx->Shared->NullBufferObj;
+   }
+   else {
+      /* non-default buffer object */
+      newBufObj = _mesa_lookup_bufferobj(ctx, buffer);
+      if (!newBufObj || newBufObj == &DummyBufferObject) {
+         /* If this is a new buffer object id, or one which was generated but
+          * never used before, allocate a buffer object now.
+          */
+         ASSERT(ctx->Driver.NewBufferObject);
+         newBufObj = ctx->Driver.NewBufferObject(ctx, buffer, target);
+         if (!newBufObj) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindBufferARB");
+            return;
+         }
+         _mesa_HashInsert(ctx->Shared->BufferObjects, buffer, newBufObj);
+      }
+   }
+   
+   /* bind new buffer */
+   _mesa_reference_buffer_object(ctx, bindTarget, newBufObj);
+
+   /* Pass BindBuffer call to device driver */
+   if (ctx->Driver.BindBuffer)
+      ctx->Driver.BindBuffer( ctx, target, newBufObj );
+}
+
+
+/**
+ * Update the default buffer objects in the given context to reference those
+ * specified in the shared state and release those referencing the old 
+ * shared state.
+ */
+void
+_mesa_update_default_objects_buffer_objects(struct gl_context *ctx)
+{
+   /* Bind the NullBufferObj to remove references to those
+    * in the shared context hash table.
+    */
+   bind_buffer_object( ctx, GL_ARRAY_BUFFER_ARB, 0);
+   bind_buffer_object( ctx, GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
+   bind_buffer_object( ctx, GL_PIXEL_PACK_BUFFER_ARB, 0);
+   bind_buffer_object( ctx, GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+}
+
+
+
+/**
+ * Return the gl_buffer_object for the given ID.
+ * Always return NULL for ID 0.
+ */
+struct gl_buffer_object *
+_mesa_lookup_bufferobj(struct gl_context *ctx, GLuint buffer)
+{
+   if (buffer == 0)
+      return NULL;
+   else
+      return (struct gl_buffer_object *)
+         _mesa_HashLookup(ctx->Shared->BufferObjects, buffer);
+}
+
+
+/**
+ * If *ptr points to obj, set ptr = the Null/default buffer object.
+ * This is a helper for buffer object deletion.
+ * The GL spec says that deleting a buffer object causes it to get
+ * unbound from all arrays in the current context.
+ */
+static void
+unbind(struct gl_context *ctx,
+       struct gl_buffer_object **ptr,
+       struct gl_buffer_object *obj)
+{
+   if (*ptr == obj) {
+      _mesa_reference_buffer_object(ctx, ptr, ctx->Shared->NullBufferObj);
+   }
+}
+
+
+/**
+ * Plug default/fallback buffer object functions into the device
+ * driver hooks.
+ */
+void
+_mesa_init_buffer_object_functions(struct dd_function_table *driver)
+{
+   /* GL_ARB_vertex/pixel_buffer_object */
+   driver->NewBufferObject = _mesa_new_buffer_object;
+   driver->DeleteBuffer = _mesa_delete_buffer_object;
+   driver->BindBuffer = NULL;
+   driver->BufferData = _mesa_buffer_data;
+   driver->BufferSubData = _mesa_buffer_subdata;
+   driver->GetBufferSubData = _mesa_buffer_get_subdata;
+   driver->MapBuffer = _mesa_buffer_map;
+   driver->UnmapBuffer = _mesa_buffer_unmap;
+
+   /* GL_ARB_map_buffer_range */
+   driver->MapBufferRange = _mesa_buffer_map_range;
+   driver->FlushMappedBufferRange = _mesa_buffer_flush_mapped_range;
+
+   /* GL_ARB_copy_buffer */
+   driver->CopyBufferSubData = _mesa_copy_buffer_subdata;
+}
+
+
+
+/**********************************************************************/
+/* API Functions                                                      */
+/**********************************************************************/
+
+void GLAPIENTRY
+_mesa_BindBufferARB(GLenum target, GLuint buffer)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glBindBuffer(%s, %u)\n",
+                  _mesa_lookup_enum_by_nr(target), buffer);
+
+   bind_buffer_object(ctx, target, buffer);
+}
+
+
+/**
+ * Delete a set of buffer objects.
+ * 
+ * \param n      Number of buffer objects to delete.
+ * \param ids    Array of \c n buffer object IDs.
+ */
+void GLAPIENTRY
+_mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLsizei i;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+   FLUSH_VERTICES(ctx, 0);
+
+   if (n < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteBuffersARB(n)");
+      return;
+   }
+
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+
+   for (i = 0; i < n; i++) {
+      struct gl_buffer_object *bufObj = _mesa_lookup_bufferobj(ctx, ids[i]);
+      if (bufObj) {
+         struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
+         GLuint j;
+
+         ASSERT(bufObj->Name == ids[i] || bufObj == &DummyBufferObject);
+
+         if (_mesa_bufferobj_mapped(bufObj)) {
+            /* if mapped, unmap it now */
+            ctx->Driver.UnmapBuffer(ctx, 0, bufObj);
+            bufObj->AccessFlags = DEFAULT_ACCESS;
+            bufObj->Pointer = NULL;
+         }
+
+         /* unbind any vertex pointers bound to this buffer */
+         unbind(ctx, &arrayObj->Vertex.BufferObj, bufObj);
+         unbind(ctx, &arrayObj->Weight.BufferObj, bufObj);
+         unbind(ctx, &arrayObj->Normal.BufferObj, bufObj);
+         unbind(ctx, &arrayObj->Color.BufferObj, bufObj);
+         unbind(ctx, &arrayObj->SecondaryColor.BufferObj, bufObj);
+         unbind(ctx, &arrayObj->FogCoord.BufferObj, bufObj);
+         unbind(ctx, &arrayObj->Index.BufferObj, bufObj);
+         unbind(ctx, &arrayObj->EdgeFlag.BufferObj, bufObj);
+         for (j = 0; j < Elements(arrayObj->TexCoord); j++) {
+            unbind(ctx, &arrayObj->TexCoord[j].BufferObj, bufObj);
+         }
+         for (j = 0; j < Elements(arrayObj->VertexAttrib); j++) {
+            unbind(ctx, &arrayObj->VertexAttrib[j].BufferObj, bufObj);
+         }
+
+         if (ctx->Array.ArrayBufferObj == bufObj) {
+            _mesa_BindBufferARB( GL_ARRAY_BUFFER_ARB, 0 );
+         }
+         if (ctx->Array.ElementArrayBufferObj == bufObj) {
+            _mesa_BindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );
+         }
+
+         /* unbind any pixel pack/unpack pointers bound to this buffer */
+         if (ctx->Pack.BufferObj == bufObj) {
+            _mesa_BindBufferARB( GL_PIXEL_PACK_BUFFER_EXT, 0 );
+         }
+         if (ctx->Unpack.BufferObj == bufObj) {
+            _mesa_BindBufferARB( GL_PIXEL_UNPACK_BUFFER_EXT, 0 );
+         }
+
+         /* The ID is immediately freed for re-use */
+         _mesa_HashRemove(ctx->Shared->BufferObjects, ids[i]);
+         _mesa_reference_buffer_object(ctx, &bufObj, NULL);
+      }
+   }
+
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+}
+
+
+/**
+ * Generate a set of unique buffer object IDs and store them in \c buffer.
+ * 
+ * \param n       Number of IDs to generate.
+ * \param buffer  Array of \c n locations to store the IDs.
+ */
+void GLAPIENTRY
+_mesa_GenBuffersARB(GLsizei n, GLuint *buffer)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint first;
+   GLint i;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGenBuffers(%d)\n", n);
+
+   if (n < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenBuffersARB");
+      return;
+   }
+
+   if (!buffer) {
+      return;
+   }
+
+   /*
+    * This must be atomic (generation and allocation of buffer object IDs)
+    */
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+
+   first = _mesa_HashFindFreeKeyBlock(ctx->Shared->BufferObjects, n);
+
+   /* Insert the ID and pointer to dummy buffer object into hash table */
+   for (i = 0; i < n; i++) {
+      _mesa_HashInsert(ctx->Shared->BufferObjects, first + i,
+                       &DummyBufferObject);
+      buffer[i] = first + i;
+   }
+
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+}
+
+
+/**
+ * Determine if ID is the name of a buffer object.
+ * 
+ * \param id  ID of the potential buffer object.
+ * \return  \c GL_TRUE if \c id is the name of a buffer object, 
+ *          \c GL_FALSE otherwise.
+ */
+GLboolean GLAPIENTRY
+_mesa_IsBufferARB(GLuint id)
+{
+   struct gl_buffer_object *bufObj;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+   bufObj = _mesa_lookup_bufferobj(ctx, id);
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+
+   return bufObj && bufObj != &DummyBufferObject;
+}
+
+
+void GLAPIENTRY
+_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
+                    const GLvoid * data, GLenum usage)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glBufferData(%s, %ld, %p, %s)\n",
+                  _mesa_lookup_enum_by_nr(target),
+                  (long int) size, data,
+                  _mesa_lookup_enum_by_nr(usage));
+
+   if (size < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glBufferDataARB(size < 0)");
+      return;
+   }
+
+   switch (usage) {
+   case GL_STREAM_DRAW_ARB:
+   case GL_STREAM_READ_ARB:
+   case GL_STREAM_COPY_ARB:
+   case GL_STATIC_DRAW_ARB:
+   case GL_STATIC_READ_ARB:
+   case GL_STATIC_COPY_ARB:
+   case GL_DYNAMIC_DRAW_ARB:
+   case GL_DYNAMIC_READ_ARB:
+   case GL_DYNAMIC_COPY_ARB:
+      /* OK */
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBufferDataARB(usage)");
+      return;
+   }
+
+   bufObj = get_buffer(ctx, target);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBufferDataARB(target)" );
+      return;
+   }
+   if (!_mesa_is_bufferobj(bufObj)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferDataARB(buffer 0)" );
+      return;
+   }
+   
+   if (_mesa_bufferobj_mapped(bufObj)) {
+      /* Unmap the existing buffer.  We'll replace it now.  Not an error. */
+      ctx->Driver.UnmapBuffer(ctx, target, bufObj);
+      bufObj->AccessFlags = DEFAULT_ACCESS;
+      ASSERT(bufObj->Pointer == NULL);
+   }  
+
+   FLUSH_VERTICES(ctx, _NEW_BUFFER_OBJECT);
+
+   bufObj->Written = GL_TRUE;
+
+#ifdef VBO_DEBUG
+   printf("glBufferDataARB(%u, sz %ld, from %p, usage 0x%x)\n",
+                bufObj->Name, size, data, usage);
+#endif
+
+#ifdef BOUNDS_CHECK
+   size += 100;
+#endif
+
+   ASSERT(ctx->Driver.BufferData);
+   if (!ctx->Driver.BufferData( ctx, target, size, data, usage, bufObj )) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBufferDataARB()");
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset,
+                       GLsizeiptrARB size, const GLvoid * data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   bufObj = buffer_object_subdata_range_good( ctx, target, offset, size,
+                                              "glBufferSubDataARB" );
+   if (!bufObj) {
+      /* error already recorded */
+      return;
+   }
+
+   if (size == 0)
+      return;
+
+   bufObj->Written = GL_TRUE;
+
+   ASSERT(ctx->Driver.BufferSubData);
+   ctx->Driver.BufferSubData( ctx, target, offset, size, data, bufObj );
+}
+
+
+void GLAPIENTRY
+_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset,
+                          GLsizeiptrARB size, void * data)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   bufObj = buffer_object_subdata_range_good( ctx, target, offset, size,
+                                              "glGetBufferSubDataARB" );
+   if (!bufObj) {
+      /* error already recorded */
+      return;
+   }
+
+   ASSERT(ctx->Driver.GetBufferSubData);
+   ctx->Driver.GetBufferSubData( ctx, target, offset, size, data, bufObj );
+}
+
+
+void * GLAPIENTRY
+_mesa_MapBufferARB(GLenum target, GLenum access)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object * bufObj;
+   GLbitfield accessFlags;
+   void *map;
+
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
+
+   switch (access) {
+   case GL_READ_ONLY_ARB:
+      accessFlags = GL_MAP_READ_BIT;
+      break;
+   case GL_WRITE_ONLY_ARB:
+      accessFlags = GL_MAP_WRITE_BIT;
+      break;
+   case GL_READ_WRITE_ARB:
+      accessFlags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(access)");
+      return NULL;
+   }
+
+   bufObj = get_buffer(ctx, target);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(target)" );
+      return NULL;
+   }
+   if (!_mesa_is_bufferobj(bufObj)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(buffer 0)" );
+      return NULL;
+   }
+   if (_mesa_bufferobj_mapped(bufObj)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(already mapped)");
+      return NULL;
+   }
+
+   ASSERT(ctx->Driver.MapBuffer);
+   map = ctx->Driver.MapBuffer( ctx, target, access, bufObj );
+   if (!map) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(map failed)");
+      return NULL;
+   }
+   else {
+      /* The driver callback should have set these fields.
+       * This is important because other modules (like VBO) might call
+       * the driver function directly.
+       */
+      ASSERT(bufObj->Pointer == map);
+      ASSERT(bufObj->Length == bufObj->Size);
+      ASSERT(bufObj->Offset == 0);
+      bufObj->AccessFlags = accessFlags;
+   }
+
+   if (access == GL_WRITE_ONLY_ARB || access == GL_READ_WRITE_ARB)
+      bufObj->Written = GL_TRUE;
+
+#ifdef VBO_DEBUG
+   printf("glMapBufferARB(%u, sz %ld, access 0x%x)\n",
+	  bufObj->Name, bufObj->Size, access);
+   if (access == GL_WRITE_ONLY_ARB) {
+      GLuint i;
+      GLubyte *b = (GLubyte *) bufObj->Pointer;
+      for (i = 0; i < bufObj->Size; i++)
+         b[i] = i & 0xff;
+   }
+#endif
+
+#ifdef BOUNDS_CHECK
+   {
+      GLubyte *buf = (GLubyte *) bufObj->Pointer;
+      GLuint i;
+      /* buffer is 100 bytes larger than requested, fill with magic value */
+      for (i = 0; i < 100; i++) {
+         buf[bufObj->Size - i - 1] = 123;
+      }
+   }
+#endif
+
+   return bufObj->Pointer;
+}
+
+
+GLboolean GLAPIENTRY
+_mesa_UnmapBufferARB(GLenum target)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   GLboolean status = GL_TRUE;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   bufObj = get_buffer(ctx, target);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glUnmapBufferARB(target)" );
+      return GL_FALSE;
+   }
+   if (!_mesa_is_bufferobj(bufObj)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB" );
+      return GL_FALSE;
+   }
+   if (!_mesa_bufferobj_mapped(bufObj)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB");
+      return GL_FALSE;
+   }
+
+#ifdef BOUNDS_CHECK
+   if (bufObj->Access != GL_READ_ONLY_ARB) {
+      GLubyte *buf = (GLubyte *) bufObj->Pointer;
+      GLuint i;
+      /* check that last 100 bytes are still = magic value */
+      for (i = 0; i < 100; i++) {
+         GLuint pos = bufObj->Size - i - 1;
+         if (buf[pos] != 123) {
+            _mesa_warning(ctx, "Out of bounds buffer object write detected"
+                          " at position %d (value = %u)\n",
+                          pos, buf[pos]);
+         }
+      }
+   }
+#endif
+
+#ifdef VBO_DEBUG
+   if (bufObj->AccessFlags & GL_MAP_WRITE_BIT) {
+      GLuint i, unchanged = 0;
+      GLubyte *b = (GLubyte *) bufObj->Pointer;
+      GLint pos = -1;
+      /* check which bytes changed */
+      for (i = 0; i < bufObj->Size - 1; i++) {
+         if (b[i] == (i & 0xff) && b[i+1] == ((i+1) & 0xff)) {
+            unchanged++;
+            if (pos == -1)
+               pos = i;
+         }
+      }
+      if (unchanged) {
+         printf("glUnmapBufferARB(%u): %u of %ld unchanged, starting at %d\n",
+                      bufObj->Name, unchanged, bufObj->Size, pos);
+      }
+   }
+#endif
+
+   status = ctx->Driver.UnmapBuffer( ctx, target, bufObj );
+   bufObj->AccessFlags = DEFAULT_ACCESS;
+   ASSERT(bufObj->Pointer == NULL);
+   ASSERT(bufObj->Offset == 0);
+   ASSERT(bufObj->Length == 0);
+
+   return status;
+}
+
+
+void GLAPIENTRY
+_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   bufObj = get_buffer(ctx, target);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(target)" );
+      return;
+   }
+   if (!_mesa_is_bufferobj(bufObj)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferParameterivARB" );
+      return;
+   }
+
+   switch (pname) {
+   case GL_BUFFER_SIZE_ARB:
+      *params = (GLint) bufObj->Size;
+      return;
+   case GL_BUFFER_USAGE_ARB:
+      *params = bufObj->Usage;
+      return;
+   case GL_BUFFER_ACCESS_ARB:
+      *params = simplified_access_mode(bufObj->AccessFlags);
+      return;
+   case GL_BUFFER_MAPPED_ARB:
+      *params = _mesa_bufferobj_mapped(bufObj);
+      return;
+   case GL_BUFFER_ACCESS_FLAGS:
+      if (ctx->VersionMajor < 3)
+         goto invalid_pname;
+      *params = bufObj->AccessFlags;
+      return;
+   case GL_BUFFER_MAP_OFFSET:
+      if (ctx->VersionMajor < 3)
+         goto invalid_pname;
+      *params = (GLint) bufObj->Offset;
+      return;
+   case GL_BUFFER_MAP_LENGTH:
+      if (ctx->VersionMajor < 3)
+         goto invalid_pname;
+      *params = (GLint) bufObj->Length;
+      return;
+   default:
+      ; /* fall-through */
+   }
+
+invalid_pname:
+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(pname=%s)",
+               _mesa_lookup_enum_by_nr(pname));
+}
+
+
+/**
+ * New in GL 3.2
+ * This is pretty much a duplicate of GetBufferParameteriv() but the
+ * GL_BUFFER_SIZE_ARB attribute will be 64-bits on a 64-bit system.
+ */
+void GLAPIENTRY
+_mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   bufObj = get_buffer(ctx, target);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(target)" );
+      return;
+   }
+   if (!_mesa_is_bufferobj(bufObj)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferParameteri64v" );
+      return;
+   }
+
+   switch (pname) {
+   case GL_BUFFER_SIZE_ARB:
+      *params = bufObj->Size;
+      return;
+   case GL_BUFFER_USAGE_ARB:
+      *params = bufObj->Usage;
+      return;
+   case GL_BUFFER_ACCESS_ARB:
+      *params = simplified_access_mode(bufObj->AccessFlags);
+      return;
+   case GL_BUFFER_ACCESS_FLAGS:
+      if (ctx->VersionMajor < 3)
+         goto invalid_pname;
+      *params = bufObj->AccessFlags;
+      return;
+   case GL_BUFFER_MAPPED_ARB:
+      *params = _mesa_bufferobj_mapped(bufObj);
+      return;
+   case GL_BUFFER_MAP_OFFSET:
+      if (ctx->VersionMajor < 3)
+         goto invalid_pname;
+      *params = bufObj->Offset;
+      return;
+   case GL_BUFFER_MAP_LENGTH:
+      if (ctx->VersionMajor < 3)
+         goto invalid_pname;
+      *params = bufObj->Length;
+      return;
+   default:
+      ; /* fall-through */
+   }
+
+invalid_pname:
+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(pname=%s)",
+               _mesa_lookup_enum_by_nr(pname));
+}
+
+
+void GLAPIENTRY
+_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object * bufObj;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (pname != GL_BUFFER_MAP_POINTER_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferPointervARB(pname)");
+      return;
+   }
+
+   bufObj = get_buffer(ctx, target);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferPointervARB(target)" );
+      return;
+   }
+   if (!_mesa_is_bufferobj(bufObj)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferPointervARB" );
+      return;
+   }
+
+   *params = bufObj->Pointer;
+}
+
+
+void GLAPIENTRY
+_mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
+                        GLintptr readOffset, GLintptr writeOffset,
+                        GLsizeiptr size)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *src, *dst;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   src = get_buffer(ctx, readTarget);
+   if (!src || !_mesa_is_bufferobj(src)) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glCopyBuffserSubData(readTarget = 0x%x)", readTarget);
+      return;
+   }
+
+   dst = get_buffer(ctx, writeTarget);
+   if (!dst || !_mesa_is_bufferobj(dst)) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glCopyBuffserSubData(writeTarget = 0x%x)", writeTarget);
+      return;
+   }
+
+   if (_mesa_bufferobj_mapped(src)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glCopyBuffserSubData(readBuffer is mapped)");
+      return;
+   }
+
+   if (_mesa_bufferobj_mapped(dst)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glCopyBuffserSubData(writeBuffer is mapped)");
+      return;
+   }
+
+   if (readOffset < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyBuffserSubData(readOffset = %d)", (int) readOffset);
+      return;
+   }
+
+   if (writeOffset < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyBuffserSubData(writeOffset = %d)", (int) writeOffset);
+      return;
+   }
+
+   if (readOffset + size > src->Size) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyBuffserSubData(readOffset + size = %d)",
+                  (int) (readOffset + size));
+      return;
+   }
+
+   if (writeOffset + size > dst->Size) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyBuffserSubData(writeOffset + size = %d)",
+                  (int) (writeOffset + size));
+      return;
+   }
+
+   if (src == dst) {
+      if (readOffset + size <= writeOffset) {
+         /* OK */
+      }
+      else if (writeOffset + size <= readOffset) {
+         /* OK */
+      }
+      else {
+         /* overlapping src/dst is illegal */
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glCopyBuffserSubData(overlapping src/dst)");
+         return;
+      }
+   }
+
+   ctx->Driver.CopyBufferSubData(ctx, src, dst, readOffset, writeOffset, size);
+}
+
+
+/**
+ * See GL_ARB_map_buffer_range spec
+ */
+void * GLAPIENTRY
+_mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
+                     GLbitfield access)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   void *map;
+
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
+
+   if (!ctx->Extensions.ARB_map_buffer_range) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(extension not supported)");
+      return NULL;
+   }
+
+   if (offset < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glMapBufferRange(offset = %ld)", (long)offset);
+      return NULL;
+   }
+
+   if (length < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glMapBufferRange(length = %ld)", (long)length);
+      return NULL;
+   }
+
+   if ((access & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)) == 0) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(access indicates neither read or write)");
+      return NULL;
+   }
+
+   if ((access & GL_MAP_READ_BIT) &&
+       (access & (GL_MAP_INVALIDATE_RANGE_BIT |
+                  GL_MAP_INVALIDATE_BUFFER_BIT |
+                  GL_MAP_UNSYNCHRONIZED_BIT))) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(invalid access flags)");
+      return NULL;
+   }
+
+   if ((access & GL_MAP_FLUSH_EXPLICIT_BIT) &&
+       ((access & GL_MAP_WRITE_BIT) == 0)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(invalid access flags)");
+      return NULL;
+   }
+
+   bufObj = get_buffer(ctx, target);
+   if (!bufObj || !_mesa_is_bufferobj(bufObj)) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glMapBufferRange(target = 0x%x)", target);
+      return NULL;
+   }
+
+   if (offset + length > bufObj->Size) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glMapBufferRange(offset + length > size)");
+      return NULL;
+   }
+
+   if (_mesa_bufferobj_mapped(bufObj)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(buffer already mapped)");
+      return NULL;
+   }
+      
+   ASSERT(ctx->Driver.MapBufferRange);
+   map = ctx->Driver.MapBufferRange(ctx, target, offset, length,
+                                    access, bufObj);
+   if (!map) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(map failed)");
+   }
+   else {
+      /* The driver callback should have set all these fields.
+       * This is important because other modules (like VBO) might call
+       * the driver function directly.
+       */
+      ASSERT(bufObj->Pointer == map);
+      ASSERT(bufObj->Length == length);
+      ASSERT(bufObj->Offset == offset);
+      ASSERT(bufObj->AccessFlags == access);
+   }
+
+   return map;
+}
+
+
+/**
+ * See GL_ARB_map_buffer_range spec
+ */
+void GLAPIENTRY
+_mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_buffer_object *bufObj;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!ctx->Extensions.ARB_map_buffer_range) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(extension not supported)");
+      return;
+   }
+
+   if (offset < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glMapBufferRange(offset = %ld)", (long)offset);
+      return;
+   }
+
+   if (length < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glMapBufferRange(length = %ld)", (long)length);
+      return;
+   }
+
+   bufObj = get_buffer(ctx, target);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glMapBufferRange(target = 0x%x)", target);
+      return;
+   }
+
+   if (!_mesa_is_bufferobj(bufObj)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(current buffer is 0)");
+      return;
+   }
+
+   if (!_mesa_bufferobj_mapped(bufObj)) {
+      /* buffer is not mapped */
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(buffer is not mapped)");
+      return;
+   }
+
+   if ((bufObj->AccessFlags & GL_MAP_FLUSH_EXPLICIT_BIT) == 0) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glMapBufferRange(GL_MAP_FLUSH_EXPLICIT_BIT not set)");
+      return;
+   }
+
+   if (offset + length > bufObj->Length) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+		  "glMapBufferRange(offset %ld + length %ld > mapped length %ld)",
+		  (long)offset, (long)length, (long)bufObj->Length);
+      return;
+   }
+
+   ASSERT(bufObj->AccessFlags & GL_MAP_WRITE_BIT);
+
+   if (ctx->Driver.FlushMappedBufferRange)
+      ctx->Driver.FlushMappedBufferRange(ctx, target, offset, length, bufObj);
+}
+
+
+#if FEATURE_APPLE_object_purgeable
+static GLenum
+buffer_object_purgeable(struct gl_context *ctx, GLuint name, GLenum option)
+{
+   struct gl_buffer_object *bufObj;
+   GLenum retval;
+
+   bufObj = _mesa_lookup_bufferobj(ctx, name);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectPurgeable(name = 0x%x)", name);
+      return 0;
+   }
+   if (!_mesa_is_bufferobj(bufObj)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glObjectPurgeable(buffer 0)" );
+      return 0;
+   }
+
+   if (bufObj->Purgeable) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glObjectPurgeable(name = 0x%x) is already purgeable", name);
+      return GL_VOLATILE_APPLE;
+   }
+
+   bufObj->Purgeable = GL_TRUE;
+
+   retval = GL_VOLATILE_APPLE;
+   if (ctx->Driver.BufferObjectPurgeable)
+      retval = ctx->Driver.BufferObjectPurgeable(ctx, bufObj, option);
+
+   return retval;
+}
+
+
+static GLenum
+renderbuffer_purgeable(struct gl_context *ctx, GLuint name, GLenum option)
+{
+   struct gl_renderbuffer *bufObj;
+   GLenum retval;
+
+   bufObj = _mesa_lookup_renderbuffer(ctx, name);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectUnpurgeable(name = 0x%x)", name);
+      return 0;
+   }
+
+   if (bufObj->Purgeable) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glObjectPurgeable(name = 0x%x) is already purgeable", name);
+      return GL_VOLATILE_APPLE;
+   }
+
+   bufObj->Purgeable = GL_TRUE;
+
+   retval = GL_VOLATILE_APPLE;
+   if (ctx->Driver.RenderObjectPurgeable)
+      retval = ctx->Driver.RenderObjectPurgeable(ctx, bufObj, option);
+
+   return retval;
+}
+
+
+static GLenum
+texture_object_purgeable(struct gl_context *ctx, GLuint name, GLenum option)
+{
+   struct gl_texture_object *bufObj;
+   GLenum retval;
+
+   bufObj = _mesa_lookup_texture(ctx, name);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectPurgeable(name = 0x%x)", name);
+      return 0;
+   }
+
+   if (bufObj->Purgeable) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glObjectPurgeable(name = 0x%x) is already purgeable", name);
+      return GL_VOLATILE_APPLE;
+   }
+
+   bufObj->Purgeable = GL_TRUE;
+
+   retval = GL_VOLATILE_APPLE;
+   if (ctx->Driver.TextureObjectPurgeable)
+      retval = ctx->Driver.TextureObjectPurgeable(ctx, bufObj, option);
+
+   return retval;
+}
+
+
+GLenum GLAPIENTRY
+_mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
+{
+   GLenum retval;
+
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
+
+   if (name == 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectPurgeable(name = 0x%x)", name);
+      return 0;
+   }
+
+   switch (option) {
+   case GL_VOLATILE_APPLE:
+   case GL_RELEASED_APPLE:
+      /* legal */
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glObjectPurgeable(name = 0x%x) invalid option: %d",
+                  name, option);
+      return 0;
+   }
+
+   switch (objectType) {
+   case GL_TEXTURE:
+      retval = texture_object_purgeable(ctx, name, option);
+      break;
+   case GL_RENDERBUFFER_EXT:
+      retval = renderbuffer_purgeable(ctx, name, option);
+      break;
+   case GL_BUFFER_OBJECT_APPLE:
+      retval = buffer_object_purgeable(ctx, name, option);
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glObjectPurgeable(name = 0x%x) invalid type: %d",
+                  name, objectType);
+      return 0;
+   }
+
+   /* In strict conformance to the spec, we must only return VOLATILE when
+    * when passed the VOLATILE option. Madness.
+    *
+    * XXX First fix the spec, then fix me.
+    */
+   return option == GL_VOLATILE_APPLE ? GL_VOLATILE_APPLE : retval;
+}
+
+
+static GLenum
+buffer_object_unpurgeable(struct gl_context *ctx, GLuint name, GLenum option)
+{
+   struct gl_buffer_object *bufObj;
+   GLenum retval;
+
+   bufObj = _mesa_lookup_bufferobj(ctx, name);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectUnpurgeable(name = 0x%x)", name);
+      return 0;
+   }
+
+   if (! bufObj->Purgeable) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glObjectUnpurgeable(name = 0x%x) object is "
+                  " already \"unpurged\"", name);
+      return 0;
+   }
+
+   bufObj->Purgeable = GL_FALSE;
+
+   retval = option;
+   if (ctx->Driver.BufferObjectUnpurgeable)
+      retval = ctx->Driver.BufferObjectUnpurgeable(ctx, bufObj, option);
+
+   return retval;
+}
+
+
+static GLenum
+renderbuffer_unpurgeable(struct gl_context *ctx, GLuint name, GLenum option)
+{
+   struct gl_renderbuffer *bufObj;
+   GLenum retval;
+
+   bufObj = _mesa_lookup_renderbuffer(ctx, name);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectUnpurgeable(name = 0x%x)", name);
+      return 0;
+   }
+
+   if (! bufObj->Purgeable) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glObjectUnpurgeable(name = 0x%x) object is "
+                  " already \"unpurged\"", name);
+      return 0;
+   }
+
+   bufObj->Purgeable = GL_FALSE;
+
+   retval = option;
+   if (ctx->Driver.RenderObjectUnpurgeable)
+      retval = ctx->Driver.RenderObjectUnpurgeable(ctx, bufObj, option);
+
+   return retval;
+}
+
+
+static GLenum
+texture_object_unpurgeable(struct gl_context *ctx, GLuint name, GLenum option)
+{
+   struct gl_texture_object *bufObj;
+   GLenum retval;
+
+   bufObj = _mesa_lookup_texture(ctx, name);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectUnpurgeable(name = 0x%x)", name);
+      return 0;
+   }
+
+   if (! bufObj->Purgeable) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glObjectUnpurgeable(name = 0x%x) object is"
+                  " already \"unpurged\"", name);
+      return 0;
+   }
+
+   bufObj->Purgeable = GL_FALSE;
+
+   retval = option;
+   if (ctx->Driver.TextureObjectUnpurgeable)
+      retval = ctx->Driver.TextureObjectUnpurgeable(ctx, bufObj, option);
+
+   return retval;
+}
+
+
+GLenum GLAPIENTRY
+_mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
+
+   if (name == 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectUnpurgeable(name = 0x%x)", name);
+      return 0;
+   }
+
+   switch (option) {
+   case GL_RETAINED_APPLE:
+   case GL_UNDEFINED_APPLE:
+      /* legal */
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glObjectUnpurgeable(name = 0x%x) invalid option: %d",
+                  name, option);
+      return 0;
+   }
+
+   switch (objectType) {
+   case GL_BUFFER_OBJECT_APPLE:
+      return buffer_object_unpurgeable(ctx, name, option);
+   case GL_TEXTURE:
+      return texture_object_unpurgeable(ctx, name, option);
+   case GL_RENDERBUFFER_EXT:
+      return renderbuffer_unpurgeable(ctx, name, option);
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glObjectUnpurgeable(name = 0x%x) invalid type: %d",
+                  name, objectType);
+      return 0;
+   }
+}
+
+
+static void
+get_buffer_object_parameteriv(struct gl_context *ctx, GLuint name,
+                              GLenum pname, GLint *params)
+{
+   struct gl_buffer_object *bufObj = _mesa_lookup_bufferobj(ctx, name);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glGetObjectParameteriv(name = 0x%x) invalid object", name);
+      return;
+   }
+
+   switch (pname) {
+   case GL_PURGEABLE_APPLE:
+      *params = bufObj->Purgeable;
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d",
+                  name, pname);
+      break;
+   }
+}
+
+
+static void
+get_renderbuffer_parameteriv(struct gl_context *ctx, GLuint name,
+                             GLenum pname, GLint *params)
+{
+   struct gl_renderbuffer *rb = _mesa_lookup_renderbuffer(ctx, name);
+   if (!rb) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectUnpurgeable(name = 0x%x)", name);
+      return;
+   }
+
+   switch (pname) {
+   case GL_PURGEABLE_APPLE:
+      *params = rb->Purgeable;
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d",
+                  name, pname);
+      break;
+   }
+}
+
+
+static void
+get_texture_object_parameteriv(struct gl_context *ctx, GLuint name,
+                               GLenum pname, GLint *params)
+{
+   struct gl_texture_object *texObj = _mesa_lookup_texture(ctx, name);
+   if (!texObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectUnpurgeable(name = 0x%x)", name);
+      return;
+   }
+
+   switch (pname) {
+   case GL_PURGEABLE_APPLE:
+      *params = texObj->Purgeable;
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d",
+                  name, pname);
+      break;
+   }
+}
+
+
+void GLAPIENTRY
+_mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname,
+                                GLint *params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (name == 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glGetObjectParameteriv(name = 0x%x)", name);
+      return;
+   }
+
+   switch (objectType) {
+   case GL_TEXTURE:
+      get_texture_object_parameteriv(ctx, name, pname, params);
+      break;
+   case GL_BUFFER_OBJECT_APPLE:
+      get_buffer_object_parameteriv(ctx, name, pname, params);
+      break;
+   case GL_RENDERBUFFER_EXT:
+      get_renderbuffer_parameteriv(ctx, name, pname, params);
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glGetObjectParameteriv(name = 0x%x) invalid type: %d",
+                  name, objectType);
+   }
+}
+
+#endif /* FEATURE_APPLE_object_purgeable */
diff --git a/mesalib/src/mesa/main/bufferobj.h b/mesalib/src/mesa/main/bufferobj.h
index f673f431f..7581b8e2c 100644
--- a/mesalib/src/mesa/main/bufferobj.h
+++ b/mesalib/src/mesa/main/bufferobj.h
@@ -75,9 +75,19 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
 				GLuint name, GLenum target );

 

 extern void

+_mesa_reference_buffer_object_(struct gl_context *ctx,

+                               struct gl_buffer_object **ptr,

+                               struct gl_buffer_object *bufObj);

+

+static INLINE void

 _mesa_reference_buffer_object(struct gl_context *ctx,

                               struct gl_buffer_object **ptr,

-                              struct gl_buffer_object *bufObj);

+                              struct gl_buffer_object *bufObj)

+{

+   if (*ptr != bufObj)

+      _mesa_reference_buffer_object_(ctx, ptr, bufObj);

+}

+

 

 extern void

 _mesa_init_buffer_object_functions(struct dd_function_table *driver);

diff --git a/mesalib/src/mesa/main/framebuffer.c b/mesalib/src/mesa/main/framebuffer.c
index ac104a2ce..a32976211 100644
--- a/mesalib/src/mesa/main/framebuffer.c
+++ b/mesalib/src/mesa/main/framebuffer.c
@@ -232,17 +232,13 @@ _mesa_free_framebuffer_data(struct gl_framebuffer *fb)
 

 /**

  * Set *ptr to point to fb, with refcounting and locking.

+ * This is normally only called from the _mesa_reference_framebuffer() macro

+ * when there's a real pointer change.

  */

 void

-_mesa_reference_framebuffer(struct gl_framebuffer **ptr,

-                            struct gl_framebuffer *fb)

+_mesa_reference_framebuffer_(struct gl_framebuffer **ptr,

+                             struct gl_framebuffer *fb)

 {

-   assert(ptr);

-   if (*ptr == fb) {

-      /* no change */

-      return;

-   }

-

    if (*ptr) {

       /* unreference old renderbuffer */

       GLboolean deleteFlag = GL_FALSE;

diff --git a/mesalib/src/mesa/main/framebuffer.h b/mesalib/src/mesa/main/framebuffer.h
index 261f84515..b2b29a7a1 100644
--- a/mesalib/src/mesa/main/framebuffer.h
+++ b/mesalib/src/mesa/main/framebuffer.h
@@ -1,102 +1,110 @@
-/*

- * Mesa 3-D graphics library

- * Version:  6.5

- *

- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-#ifndef FRAMEBUFFER_H

-#define FRAMEBUFFER_H

-

-#include "glheader.h"

-

-struct gl_config;

-struct gl_context;

-

-extern struct gl_framebuffer *

-_mesa_create_framebuffer(const struct gl_config *visual);

-

-extern struct gl_framebuffer *

-_mesa_new_framebuffer(struct gl_context *ctx, GLuint name);

-

-extern void

-_mesa_initialize_window_framebuffer(struct gl_framebuffer *fb,

-				     const struct gl_config *visual);

-

-extern void

-_mesa_initialize_user_framebuffer(struct gl_framebuffer *fb, GLuint name);

-

-extern void

-_mesa_destroy_framebuffer(struct gl_framebuffer *buffer);

-

-extern void

-_mesa_free_framebuffer_data(struct gl_framebuffer *buffer);

-

-extern void

-_mesa_reference_framebuffer(struct gl_framebuffer **ptr,

-                            struct gl_framebuffer *fb);

-

-extern void

-_mesa_resize_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb,

-                         GLuint width, GLuint height);

-

-

-extern void

-_mesa_resizebuffers( struct gl_context *ctx );

-

-extern void GLAPIENTRY

-_mesa_ResizeBuffersMESA( void );

-

-

-extern void 

-_mesa_update_draw_buffer_bounds(struct gl_context *ctx);

-

-extern void

-_mesa_update_framebuffer_visual(struct gl_context *ctx,

-				struct gl_framebuffer *fb);

-

-extern void

-_mesa_update_depth_buffer(struct gl_context *ctx, struct gl_framebuffer *fb,

-                            GLuint attIndex);

-

-extern void

-_mesa_update_stencil_buffer(struct gl_context *ctx, struct gl_framebuffer *fb,

-                            GLuint attIndex);

-

-extern void

-_mesa_update_framebuffer(struct gl_context *ctx);

-

-extern GLboolean

-_mesa_source_buffer_exists(struct gl_context *ctx, GLenum format);

-

-extern GLboolean

-_mesa_dest_buffer_exists(struct gl_context *ctx, GLenum format);

-

-extern GLenum

-_mesa_get_color_read_type(struct gl_context *ctx);

-

-extern GLenum

-_mesa_get_color_read_format(struct gl_context *ctx);

-

-extern void

-_mesa_print_framebuffer(const struct gl_framebuffer *fb);

-

-#endif /* FRAMEBUFFER_H */

+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5
+ *
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef FRAMEBUFFER_H
+#define FRAMEBUFFER_H
+
+#include "glheader.h"
+
+struct gl_config;
+struct gl_context;
+
+extern struct gl_framebuffer *
+_mesa_create_framebuffer(const struct gl_config *visual);
+
+extern struct gl_framebuffer *
+_mesa_new_framebuffer(struct gl_context *ctx, GLuint name);
+
+extern void
+_mesa_initialize_window_framebuffer(struct gl_framebuffer *fb,
+				     const struct gl_config *visual);
+
+extern void
+_mesa_initialize_user_framebuffer(struct gl_framebuffer *fb, GLuint name);
+
+extern void
+_mesa_destroy_framebuffer(struct gl_framebuffer *buffer);
+
+extern void
+_mesa_free_framebuffer_data(struct gl_framebuffer *buffer);
+
+extern void
+_mesa_reference_framebuffer_(struct gl_framebuffer **ptr,
+                             struct gl_framebuffer *fb);
+
+static INLINE void
+_mesa_reference_framebuffer(struct gl_framebuffer **ptr,
+                            struct gl_framebuffer *fb)
+{
+   if (*ptr != fb)
+      _mesa_reference_framebuffer_(ptr, fb);
+}
+
+extern void
+_mesa_resize_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
+                         GLuint width, GLuint height);
+
+
+extern void
+_mesa_resizebuffers( struct gl_context *ctx );
+
+extern void GLAPIENTRY
+_mesa_ResizeBuffersMESA( void );
+
+
+extern void 
+_mesa_update_draw_buffer_bounds(struct gl_context *ctx);
+
+extern void
+_mesa_update_framebuffer_visual(struct gl_context *ctx,
+				struct gl_framebuffer *fb);
+
+extern void
+_mesa_update_depth_buffer(struct gl_context *ctx, struct gl_framebuffer *fb,
+                            GLuint attIndex);
+
+extern void
+_mesa_update_stencil_buffer(struct gl_context *ctx, struct gl_framebuffer *fb,
+                            GLuint attIndex);
+
+extern void
+_mesa_update_framebuffer(struct gl_context *ctx);
+
+extern GLboolean
+_mesa_source_buffer_exists(struct gl_context *ctx, GLenum format);
+
+extern GLboolean
+_mesa_dest_buffer_exists(struct gl_context *ctx, GLenum format);
+
+extern GLenum
+_mesa_get_color_read_type(struct gl_context *ctx);
+
+extern GLenum
+_mesa_get_color_read_format(struct gl_context *ctx);
+
+extern void
+_mesa_print_framebuffer(const struct gl_framebuffer *fb);
+
+#endif /* FRAMEBUFFER_H */
diff --git a/mesalib/src/mesa/main/renderbuffer.c b/mesalib/src/mesa/main/renderbuffer.c
index 6ae8b1f96..08bb23cb3 100644
--- a/mesalib/src/mesa/main/renderbuffer.c
+++ b/mesalib/src/mesa/main/renderbuffer.c
@@ -2530,17 +2530,13 @@ _mesa_remove_renderbuffer(struct gl_framebuffer *fb,
  * Set *ptr to point to rb.  If *ptr points to another renderbuffer,

  * dereference that buffer first.  The new renderbuffer's refcount will

  * be incremented.  The old renderbuffer's refcount will be decremented.

+ * This is normally only called from the _mesa_reference_renderbuffer() macro

+ * when there's a real pointer change.

  */

 void

-_mesa_reference_renderbuffer(struct gl_renderbuffer **ptr,

-                             struct gl_renderbuffer *rb)

+_mesa_reference_renderbuffer_(struct gl_renderbuffer **ptr,

+                              struct gl_renderbuffer *rb)

 {

-   assert(ptr);

-   if (*ptr == rb) {

-      /* no change */

-      return;

-   }

-

    if (*ptr) {

       /* Unreference the old renderbuffer */

       GLboolean deleteFlag = GL_FALSE;

diff --git a/mesalib/src/mesa/main/renderbuffer.h b/mesalib/src/mesa/main/renderbuffer.h
index 4ac691824..99488c1d3 100644
--- a/mesalib/src/mesa/main/renderbuffer.h
+++ b/mesalib/src/mesa/main/renderbuffer.h
@@ -105,8 +105,17 @@ _mesa_remove_renderbuffer(struct gl_framebuffer *fb,
                           gl_buffer_index bufferName);

 

 extern void

+_mesa_reference_renderbuffer_(struct gl_renderbuffer **ptr,

+                              struct gl_renderbuffer *rb);

+

+static INLINE void

 _mesa_reference_renderbuffer(struct gl_renderbuffer **ptr,

-                             struct gl_renderbuffer *rb);

+                             struct gl_renderbuffer *rb)

+{

+   if (*ptr != rb)

+      _mesa_reference_renderbuffer_(ptr, rb);

+}

+      

 

 

 #endif /* RENDERBUFFER_H */

diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index 9fc3d995b..a28c15ba2 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -325,16 +325,14 @@ valid_texture_object(const struct gl_texture_object *tex)
  * Reference (or unreference) a texture object.

  * If '*ptr', decrement *ptr's refcount (and delete if it becomes zero).

  * If 'tex' is non-null, increment its refcount.

+ * This is normally only called from the _mesa_reference_texobj() macro

+ * when there's a real pointer change.

  */

 void

-_mesa_reference_texobj(struct gl_texture_object **ptr,

-                       struct gl_texture_object *tex)

+_mesa_reference_texobj_(struct gl_texture_object **ptr,

+                        struct gl_texture_object *tex)

 {

    assert(ptr);

-   if (*ptr == tex) {

-      /* no change */

-      return;

-   }

 

    if (*ptr) {

       /* Unreference the old texture */

diff --git a/mesalib/src/mesa/main/texobj.h b/mesalib/src/mesa/main/texobj.h
index 0bad63867..1faae6f7e 100644
--- a/mesalib/src/mesa/main/texobj.h
+++ b/mesalib/src/mesa/main/texobj.h
@@ -1,124 +1,134 @@
-/**

- * \file texobj.h

- * Texture object management.

- */

-

-/*

- * Mesa 3-D graphics library

- * Version:  6.5

- *

- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-#ifndef TEXTOBJ_H

-#define TEXTOBJ_H

-

-

-#include "glheader.h"

-

-struct gl_context;

-

-/**

- * \name Internal functions

- */

-/*@{*/

-

-extern struct gl_texture_object *

-_mesa_lookup_texture(struct gl_context *ctx, GLuint id);

-

-extern struct gl_texture_object *

-_mesa_new_texture_object( struct gl_context *ctx, GLuint name, GLenum target );

-

-extern void

-_mesa_initialize_texture_object( struct gl_texture_object *obj,

-                                 GLuint name, GLenum target );

-

-extern void

-_mesa_delete_texture_object( struct gl_context *ctx,

-                             struct gl_texture_object *obj );

-

-extern void

-_mesa_copy_texture_object( struct gl_texture_object *dest,

-                           const struct gl_texture_object *src );

-

-extern void

-_mesa_clear_texture_object(struct gl_context *ctx,

-                           struct gl_texture_object *obj);

-

-extern void

-_mesa_reference_texobj(struct gl_texture_object **ptr,

-                       struct gl_texture_object *tex);

-

-extern void

-_mesa_test_texobj_completeness( const struct gl_context *ctx,

-                                struct gl_texture_object *obj );

-

-extern GLboolean

-_mesa_cube_complete(const struct gl_texture_object *texObj);

-

-extern void

-_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj,

-                   GLboolean invalidate_state);

-

-extern struct gl_texture_object *

-_mesa_get_fallback_texture(struct gl_context *ctx);

-

-extern void

-_mesa_unlock_context_textures( struct gl_context *ctx );

-

-extern void

-_mesa_lock_context_textures( struct gl_context *ctx );

-

-/*@}*/

-

-/**

- * \name API functions

- */

-/*@{*/

-

-extern void GLAPIENTRY

-_mesa_GenTextures( GLsizei n, GLuint *textures );

-

-

-extern void GLAPIENTRY

-_mesa_DeleteTextures( GLsizei n, const GLuint *textures );

-

-

-extern void GLAPIENTRY

-_mesa_BindTexture( GLenum target, GLuint texture );

-

-

-extern void GLAPIENTRY

-_mesa_PrioritizeTextures( GLsizei n, const GLuint *textures,

-                          const GLclampf *priorities );

-

-

-extern GLboolean GLAPIENTRY

-_mesa_AreTexturesResident( GLsizei n, const GLuint *textures,

-                           GLboolean *residences );

-

-extern GLboolean GLAPIENTRY

-_mesa_IsTexture( GLuint texture );

-

-/*@}*/

-

-

-#endif

+/**
+ * \file texobj.h
+ * Texture object management.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5
+ *
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef TEXTOBJ_H
+#define TEXTOBJ_H
+
+
+#include "compiler.h"
+#include "glheader.h"
+
+struct gl_context;
+
+/**
+ * \name Internal functions
+ */
+/*@{*/
+
+extern struct gl_texture_object *
+_mesa_lookup_texture(struct gl_context *ctx, GLuint id);
+
+extern struct gl_texture_object *
+_mesa_new_texture_object( struct gl_context *ctx, GLuint name, GLenum target );
+
+extern void
+_mesa_initialize_texture_object( struct gl_texture_object *obj,
+                                 GLuint name, GLenum target );
+
+extern void
+_mesa_delete_texture_object( struct gl_context *ctx,
+                             struct gl_texture_object *obj );
+
+extern void
+_mesa_copy_texture_object( struct gl_texture_object *dest,
+                           const struct gl_texture_object *src );
+
+extern void
+_mesa_clear_texture_object(struct gl_context *ctx,
+                           struct gl_texture_object *obj);
+
+extern void
+_mesa_reference_texobj_(struct gl_texture_object **ptr,
+                        struct gl_texture_object *tex);
+
+static INLINE void
+_mesa_reference_texobj(struct gl_texture_object **ptr,
+                       struct gl_texture_object *tex)
+{
+   if (*ptr != tex)
+      _mesa_reference_texobj_(ptr, tex);
+}
+
+
+extern void
+_mesa_test_texobj_completeness( const struct gl_context *ctx,
+                                struct gl_texture_object *obj );
+
+extern GLboolean
+_mesa_cube_complete(const struct gl_texture_object *texObj);
+
+extern void
+_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj,
+                   GLboolean invalidate_state);
+
+extern struct gl_texture_object *
+_mesa_get_fallback_texture(struct gl_context *ctx);
+
+extern void
+_mesa_unlock_context_textures( struct gl_context *ctx );
+
+extern void
+_mesa_lock_context_textures( struct gl_context *ctx );
+
+/*@}*/
+
+/**
+ * \name API functions
+ */
+/*@{*/
+
+extern void GLAPIENTRY
+_mesa_GenTextures( GLsizei n, GLuint *textures );
+
+
+extern void GLAPIENTRY
+_mesa_DeleteTextures( GLsizei n, const GLuint *textures );
+
+
+extern void GLAPIENTRY
+_mesa_BindTexture( GLenum target, GLuint texture );
+
+
+extern void GLAPIENTRY
+_mesa_PrioritizeTextures( GLsizei n, const GLuint *textures,
+                          const GLclampf *priorities );
+
+
+extern GLboolean GLAPIENTRY
+_mesa_AreTexturesResident( GLsizei n, const GLuint *textures,
+                           GLboolean *residences );
+
+extern GLboolean GLAPIENTRY
+_mesa_IsTexture( GLuint texture );
+
+/*@}*/
+
+
+#endif
diff --git a/mesalib/src/mesa/program/program.c b/mesalib/src/mesa/program/program.c
index c39f85e89..2393a6386 100644
--- a/mesalib/src/mesa/program/program.c
+++ b/mesalib/src/mesa/program/program.c
@@ -421,12 +421,15 @@ _mesa_lookup_program(struct gl_context *ctx, GLuint id)
 

 /**

  * Reference counting for vertex/fragment programs

+ * This is normally only called from the _mesa_reference_program() macro

+ * when there's a real pointer change.

  */

 void

-_mesa_reference_program(struct gl_context *ctx,

-                        struct gl_program **ptr,

-                        struct gl_program *prog)

+_mesa_reference_program_(struct gl_context *ctx,

+                         struct gl_program **ptr,

+                         struct gl_program *prog)

 {

+#ifndef NDEBUG

    assert(ptr);

    if (*ptr && prog) {

       /* sanity check */

@@ -438,9 +441,8 @@ _mesa_reference_program(struct gl_context *ctx,
       else if ((*ptr)->Target == MESA_GEOMETRY_PROGRAM)

          ASSERT(prog->Target == MESA_GEOMETRY_PROGRAM);

    }

-   if (*ptr == prog) {

-      return;  /* no change */

-   }

+#endif

+

    if (*ptr) {

       GLboolean deleteFlag;

 

diff --git a/mesalib/src/mesa/program/program.h b/mesalib/src/mesa/program/program.h
index dcf8d1c25..0f32a6af7 100644
--- a/mesalib/src/mesa/program/program.h
+++ b/mesalib/src/mesa/program/program.h
@@ -1,210 +1,219 @@
-/*

- * Mesa 3-D graphics library

- * Version:  6.5.3

- *

- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-/**

- * \file program.c

- * Vertex and fragment program support functions.

- * \author Brian Paul

- */

-

-

-/**

- * \mainpage Mesa vertex and fragment program module

- *

- * This module or directory contains most of the code for vertex and

- * fragment programs and shaders, including state management, parsers,

- * and (some) software routines for executing programs

- */

-

-#ifndef PROGRAM_H

-#define PROGRAM_H

-

-#include "main/compiler.h"

-#include "main/mtypes.h"

-

-

-extern struct gl_program _mesa_DummyProgram;

-

-

-extern void

-_mesa_init_program(struct gl_context *ctx);

-

-extern void

-_mesa_free_program_data(struct gl_context *ctx);

-

-extern void

-_mesa_update_default_objects_program(struct gl_context *ctx);

-

-extern void

-_mesa_set_program_error(struct gl_context *ctx, GLint pos, const char *string);

-

-extern const GLubyte *

-_mesa_find_line_column(const GLubyte *string, const GLubyte *pos,

-                       GLint *line, GLint *col);

-

-

-extern struct gl_program *

-_mesa_init_vertex_program(struct gl_context *ctx,

-                          struct gl_vertex_program *prog,

-                          GLenum target, GLuint id);

-

-extern struct gl_program *

-_mesa_init_fragment_program(struct gl_context *ctx,

-                            struct gl_fragment_program *prog,

-                            GLenum target, GLuint id);

-

-extern struct gl_program *

-_mesa_init_geometry_program(struct gl_context *ctx,

-                            struct gl_geometry_program *prog,

-                            GLenum target, GLuint id);

-

-extern struct gl_program *

-_mesa_new_program(struct gl_context *ctx, GLenum target, GLuint id);

-

-extern void

-_mesa_delete_program(struct gl_context *ctx, struct gl_program *prog);

-

-extern struct gl_program *

-_mesa_lookup_program(struct gl_context *ctx, GLuint id);

-

-extern void

-_mesa_reference_program(struct gl_context *ctx,

-                        struct gl_program **ptr,

-                        struct gl_program *prog);

-

-static INLINE void

-_mesa_reference_vertprog(struct gl_context *ctx,

-                         struct gl_vertex_program **ptr,

-                         struct gl_vertex_program *prog)

-{

-   _mesa_reference_program(ctx, (struct gl_program **) ptr,

-                           (struct gl_program *) prog);

-}

-

-static INLINE void

-_mesa_reference_fragprog(struct gl_context *ctx,

-                         struct gl_fragment_program **ptr,

-                         struct gl_fragment_program *prog)

-{

-   _mesa_reference_program(ctx, (struct gl_program **) ptr,

-                           (struct gl_program *) prog);

-}

-

-static INLINE void

-_mesa_reference_geomprog(struct gl_context *ctx,

-                         struct gl_geometry_program **ptr,

-                         struct gl_geometry_program *prog)

-{

-   _mesa_reference_program(ctx, (struct gl_program **) ptr,

-                           (struct gl_program *) prog);

-}

-

-extern struct gl_program *

-_mesa_clone_program(struct gl_context *ctx, const struct gl_program *prog);

-

-static INLINE struct gl_vertex_program *

-_mesa_clone_vertex_program(struct gl_context *ctx,

-                           const struct gl_vertex_program *prog)

-{

-   return (struct gl_vertex_program *) _mesa_clone_program(ctx, &prog->Base);

-}

-

-static INLINE struct gl_geometry_program *

-_mesa_clone_geometry_program(struct gl_context *ctx,

-                             const struct gl_geometry_program *prog)

-{

-   return (struct gl_geometry_program *) _mesa_clone_program(ctx, &prog->Base);

-}

-

-static INLINE struct gl_fragment_program *

-_mesa_clone_fragment_program(struct gl_context *ctx,

-                             const struct gl_fragment_program *prog)

-{

-   return (struct gl_fragment_program *) _mesa_clone_program(ctx, &prog->Base);

-}

-

-

-extern  GLboolean

-_mesa_insert_instructions(struct gl_program *prog, GLuint start, GLuint count);

-

-extern  GLboolean

-_mesa_delete_instructions(struct gl_program *prog, GLuint start, GLuint count);

-

-extern struct gl_program *

-_mesa_combine_programs(struct gl_context *ctx,

-                       const struct gl_program *progA,

-                       const struct gl_program *progB);

-

-extern void

-_mesa_find_used_registers(const struct gl_program *prog,

-                          gl_register_file file,

-                          GLboolean used[], GLuint usedSize);

-

-extern GLint

-_mesa_find_free_register(const GLboolean used[],

-                         GLuint maxRegs, GLuint firstReg);

-

-

-extern GLboolean

-_mesa_valid_register_index(const struct gl_context *ctx,

-                           gl_shader_type shaderType,

-                           gl_register_file file, GLint index);

-

-extern void

-_mesa_postprocess_program(struct gl_context *ctx, struct gl_program *prog);

-

-/* keep these in the same order as TGSI_PROCESSOR_* */

-

-static INLINE GLuint

-_mesa_program_target_to_index(GLenum v)

-{

-   switch(v)

-   {

-   case GL_VERTEX_PROGRAM_ARB:

-      return MESA_SHADER_VERTEX;

-   case GL_FRAGMENT_PROGRAM_ARB:

-      return MESA_SHADER_FRAGMENT;

-   case GL_GEOMETRY_PROGRAM_NV:

-      return MESA_SHADER_GEOMETRY;

-   default:

-      ASSERT(0);

-      return ~0;

-   }

-}

-

-static INLINE GLenum

-_mesa_program_index_to_target(GLuint i)

-{

-   GLenum enums[MESA_SHADER_TYPES] = {

-         GL_VERTEX_PROGRAM_ARB,

-         GL_FRAGMENT_PROGRAM_ARB,

-         GL_GEOMETRY_PROGRAM_NV,

-   };

-   if(i >= MESA_SHADER_TYPES)

-      return 0;

-   else

-      return enums[i];

-}

-

-#endif /* PROGRAM_H */

+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5.3
+ *
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file program.c
+ * Vertex and fragment program support functions.
+ * \author Brian Paul
+ */
+
+
+/**
+ * \mainpage Mesa vertex and fragment program module
+ *
+ * This module or directory contains most of the code for vertex and
+ * fragment programs and shaders, including state management, parsers,
+ * and (some) software routines for executing programs
+ */
+
+#ifndef PROGRAM_H
+#define PROGRAM_H
+
+#include "main/compiler.h"
+#include "main/mtypes.h"
+
+
+extern struct gl_program _mesa_DummyProgram;
+
+
+extern void
+_mesa_init_program(struct gl_context *ctx);
+
+extern void
+_mesa_free_program_data(struct gl_context *ctx);
+
+extern void
+_mesa_update_default_objects_program(struct gl_context *ctx);
+
+extern void
+_mesa_set_program_error(struct gl_context *ctx, GLint pos, const char *string);
+
+extern const GLubyte *
+_mesa_find_line_column(const GLubyte *string, const GLubyte *pos,
+                       GLint *line, GLint *col);
+
+
+extern struct gl_program *
+_mesa_init_vertex_program(struct gl_context *ctx,
+                          struct gl_vertex_program *prog,
+                          GLenum target, GLuint id);
+
+extern struct gl_program *
+_mesa_init_fragment_program(struct gl_context *ctx,
+                            struct gl_fragment_program *prog,
+                            GLenum target, GLuint id);
+
+extern struct gl_program *
+_mesa_init_geometry_program(struct gl_context *ctx,
+                            struct gl_geometry_program *prog,
+                            GLenum target, GLuint id);
+
+extern struct gl_program *
+_mesa_new_program(struct gl_context *ctx, GLenum target, GLuint id);
+
+extern void
+_mesa_delete_program(struct gl_context *ctx, struct gl_program *prog);
+
+extern struct gl_program *
+_mesa_lookup_program(struct gl_context *ctx, GLuint id);
+
+extern void
+_mesa_reference_program_(struct gl_context *ctx,
+                         struct gl_program **ptr,
+                         struct gl_program *prog);
+
+static INLINE void
+_mesa_reference_program(struct gl_context *ctx,
+                        struct gl_program **ptr,
+                        struct gl_program *prog)
+{
+   if (*ptr != prog)
+      _mesa_reference_program_(ctx, ptr, prog);
+}
+
+static INLINE void
+_mesa_reference_vertprog(struct gl_context *ctx,
+                         struct gl_vertex_program **ptr,
+                         struct gl_vertex_program *prog)
+{
+   _mesa_reference_program(ctx, (struct gl_program **) ptr,
+                           (struct gl_program *) prog);
+}
+
+static INLINE void
+_mesa_reference_fragprog(struct gl_context *ctx,
+                         struct gl_fragment_program **ptr,
+                         struct gl_fragment_program *prog)
+{
+   _mesa_reference_program(ctx, (struct gl_program **) ptr,
+                           (struct gl_program *) prog);
+}
+
+static INLINE void
+_mesa_reference_geomprog(struct gl_context *ctx,
+                         struct gl_geometry_program **ptr,
+                         struct gl_geometry_program *prog)
+{
+   _mesa_reference_program(ctx, (struct gl_program **) ptr,
+                           (struct gl_program *) prog);
+}
+
+extern struct gl_program *
+_mesa_clone_program(struct gl_context *ctx, const struct gl_program *prog);
+
+static INLINE struct gl_vertex_program *
+_mesa_clone_vertex_program(struct gl_context *ctx,
+                           const struct gl_vertex_program *prog)
+{
+   return (struct gl_vertex_program *) _mesa_clone_program(ctx, &prog->Base);
+}
+
+static INLINE struct gl_geometry_program *
+_mesa_clone_geometry_program(struct gl_context *ctx,
+                             const struct gl_geometry_program *prog)
+{
+   return (struct gl_geometry_program *) _mesa_clone_program(ctx, &prog->Base);
+}
+
+static INLINE struct gl_fragment_program *
+_mesa_clone_fragment_program(struct gl_context *ctx,
+                             const struct gl_fragment_program *prog)
+{
+   return (struct gl_fragment_program *) _mesa_clone_program(ctx, &prog->Base);
+}
+
+
+extern  GLboolean
+_mesa_insert_instructions(struct gl_program *prog, GLuint start, GLuint count);
+
+extern  GLboolean
+_mesa_delete_instructions(struct gl_program *prog, GLuint start, GLuint count);
+
+extern struct gl_program *
+_mesa_combine_programs(struct gl_context *ctx,
+                       const struct gl_program *progA,
+                       const struct gl_program *progB);
+
+extern void
+_mesa_find_used_registers(const struct gl_program *prog,
+                          gl_register_file file,
+                          GLboolean used[], GLuint usedSize);
+
+extern GLint
+_mesa_find_free_register(const GLboolean used[],
+                         GLuint maxRegs, GLuint firstReg);
+
+
+extern GLboolean
+_mesa_valid_register_index(const struct gl_context *ctx,
+                           gl_shader_type shaderType,
+                           gl_register_file file, GLint index);
+
+extern void
+_mesa_postprocess_program(struct gl_context *ctx, struct gl_program *prog);
+
+/* keep these in the same order as TGSI_PROCESSOR_* */
+
+static INLINE GLuint
+_mesa_program_target_to_index(GLenum v)
+{
+   switch(v)
+   {
+   case GL_VERTEX_PROGRAM_ARB:
+      return MESA_SHADER_VERTEX;
+   case GL_FRAGMENT_PROGRAM_ARB:
+      return MESA_SHADER_FRAGMENT;
+   case GL_GEOMETRY_PROGRAM_NV:
+      return MESA_SHADER_GEOMETRY;
+   default:
+      ASSERT(0);
+      return ~0;
+   }
+}
+
+static INLINE GLenum
+_mesa_program_index_to_target(GLuint i)
+{
+   GLenum enums[MESA_SHADER_TYPES] = {
+         GL_VERTEX_PROGRAM_ARB,
+         GL_FRAGMENT_PROGRAM_ARB,
+         GL_GEOMETRY_PROGRAM_NV,
+   };
+   if(i >= MESA_SHADER_TYPES)
+      return 0;
+   else
+      return enums[i];
+}
+
+#endif /* PROGRAM_H */
diff --git a/mesalib/src/mesa/vbo/vbo_exec_array.c b/mesalib/src/mesa/vbo/vbo_exec_array.c
index 4594356ce..b96f026dd 100644
--- a/mesalib/src/mesa/vbo/vbo_exec_array.c
+++ b/mesalib/src/mesa/vbo/vbo_exec_array.c
@@ -972,13 +972,13 @@ static void GLAPIENTRY
 vbo_exec_DrawRangeElements(GLenum mode, GLuint start, GLuint end,

                            GLsizei count, GLenum type, const GLvoid *indices)

 {

-   GET_CURRENT_CONTEXT(ctx);

-

-   if (MESA_VERBOSE & VERBOSE_DRAW)

+   if (MESA_VERBOSE & VERBOSE_DRAW) {

+      GET_CURRENT_CONTEXT(ctx);

       _mesa_debug(ctx,

                   "glDrawRangeElements(%s, %u, %u, %d, %s, %p)\n",

                   _mesa_lookup_enum_by_nr(mode), start, end, count,

                   _mesa_lookup_enum_by_nr(type), indices);

+   }

 

    vbo_exec_DrawRangeElementsBaseVertex(mode, start, end, count, type,

 					indices, 0);