svn merge ^/branches/released .

14 files changed, 719 insertions, 795 deletions

diff --git a/mesalib/src/mesa/main/arrayobj.c b/mesalib/src/mesa/main/arrayobj.c
index 460102233..1033ce639 100644
--- a/mesalib/src/mesa/main/arrayobj.c
+++ b/mesalib/src/mesa/main/arrayobj.c
@@ -1,578 +1,579 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.6
- *
- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
- * (C) Copyright IBM Corporation 2006
- * 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 OR IBM 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 arrayobj.c
- * Functions for the GL_APPLE_vertex_array_object extension.
- *
- * \todo
- * The code in this file borrows a lot from bufferobj.c.  There's a certain
- * amount of cruft left over from that origin that may be unnecessary.
- *
- * \author Ian Romanick <idr@us.ibm.com>
- * \author Brian Paul
- */
-
-
-#include "glheader.h"
-#include "hash.h"
-#include "imports.h"
-#include "context.h"
-#include "mfeatures.h"
-#if FEATURE_ARB_vertex_buffer_object
-#include "bufferobj.h"
-#endif
-#include "arrayobj.h"
-#include "macros.h"
-#include "mtypes.h"
-#include "main/dispatch.h"
-
-
-/**
- * Look up the array object for the given ID.
- * 
- * \returns
- * Either a pointer to the array object with the specified ID or \c NULL for
- * a non-existent ID.  The spec defines ID 0 as being technically
- * non-existent.
- */
-
-static INLINE struct gl_array_object *
-lookup_arrayobj(struct gl_context *ctx, GLuint id)
-{
-   if (id == 0)
-      return NULL;
-   else
-      return (struct gl_array_object *)
-         _mesa_HashLookup(ctx->Array.Objects, id);
-}
-
-
-/**
- * For all the vertex arrays in the array object, unbind any pointers
- * to any buffer objects (VBOs).
- * This is done just prior to array object destruction.
- */
-static void
-unbind_array_object_vbos(struct gl_context *ctx, struct gl_array_object *obj)
-{
-   GLuint i;
-
-   _mesa_reference_buffer_object(ctx, &obj->Vertex.BufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &obj->Weight.BufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &obj->Normal.BufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &obj->Color.BufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &obj->SecondaryColor.BufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &obj->FogCoord.BufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &obj->Index.BufferObj, NULL);
-   _mesa_reference_buffer_object(ctx, &obj->EdgeFlag.BufferObj, NULL);
-
-   for (i = 0; i < Elements(obj->TexCoord); i++)
-      _mesa_reference_buffer_object(ctx, &obj->TexCoord[i].BufferObj, NULL);
-
-   for (i = 0; i < Elements(obj->VertexAttrib); i++)
-      _mesa_reference_buffer_object(ctx, &obj->VertexAttrib[i].BufferObj,NULL);
-
-#if FEATURE_point_size_array
-   _mesa_reference_buffer_object(ctx, &obj->PointSize.BufferObj, NULL);
-#endif
-}
-
-
-/**
- * Allocate and initialize a new vertex array object.
- * 
- * This function is intended to be called via
- * \c dd_function_table::NewArrayObject.
- */
-struct gl_array_object *
-_mesa_new_array_object( struct gl_context *ctx, GLuint name )
-{
-   struct gl_array_object *obj = CALLOC_STRUCT(gl_array_object);
-   if (obj)
-      _mesa_initialize_array_object(ctx, obj, name);
-   return obj;
-}
-
-
-/**
- * Delete an array object.
- * 
- * This function is intended to be called via
- * \c dd_function_table::DeleteArrayObject.
- */
-void
-_mesa_delete_array_object( struct gl_context *ctx, struct gl_array_object *obj )
-{
-   (void) ctx;
-   unbind_array_object_vbos(ctx, obj);
-   _glthread_DESTROY_MUTEX(obj->Mutex);
-   free(obj);
-}
-
-
-/**
- * Set ptr to arrayObj w/ reference counting.
- */
-void
-_mesa_reference_array_object(struct gl_context *ctx,
-                             struct gl_array_object **ptr,
-                             struct gl_array_object *arrayObj)
-{
-   if (*ptr == arrayObj)
-      return;
-
-   if (*ptr) {
-      /* Unreference the old array object */
-      GLboolean deleteFlag = GL_FALSE;
-      struct gl_array_object *oldObj = *ptr;
-
-      _glthread_LOCK_MUTEX(oldObj->Mutex);
-      ASSERT(oldObj->RefCount > 0);
-      oldObj->RefCount--;
-#if 0
-      printf("ArrayObj %p %d DECR to %d\n",
-             (void *) oldObj, oldObj->Name, oldObj->RefCount);
-#endif
-      deleteFlag = (oldObj->RefCount == 0);
-      _glthread_UNLOCK_MUTEX(oldObj->Mutex);
-
-      if (deleteFlag) {
-	 ASSERT(ctx->Driver.DeleteArrayObject);
-         ctx->Driver.DeleteArrayObject(ctx, oldObj);
-      }
-
-      *ptr = NULL;
-   }
-   ASSERT(!*ptr);
-
-   if (arrayObj) {
-      /* reference new array object */
-      _glthread_LOCK_MUTEX(arrayObj->Mutex);
-      if (arrayObj->RefCount == 0) {
-         /* this array's being deleted (look just above) */
-         /* Not sure this can every really happen.  Warn if it does. */
-         _mesa_problem(NULL, "referencing deleted array object");
-         *ptr = NULL;
-      }
-      else {
-         arrayObj->RefCount++;
-#if 0
-         printf("ArrayObj %p %d INCR to %d\n",
-                (void *) arrayObj, arrayObj->Name, arrayObj->RefCount);
-#endif
-         *ptr = arrayObj;
-      }
-      _glthread_UNLOCK_MUTEX(arrayObj->Mutex);
-   }
-}
-
-
-
-static void
-init_array(struct gl_context *ctx,
-           struct gl_client_array *array, GLint size, GLint type)
-{
-   array->Size = size;
-   array->Type = type;
-   array->Format = GL_RGBA; /* only significant for GL_EXT_vertex_array_bgra */
-   array->Stride = 0;
-   array->StrideB = 0;
-   array->Ptr = NULL;
-   array->Enabled = GL_FALSE;
-   array->Normalized = GL_FALSE;
-#if FEATURE_ARB_vertex_buffer_object
-   /* Vertex array buffers */
-   _mesa_reference_buffer_object(ctx, &array->BufferObj,
-                                 ctx->Shared->NullBufferObj);
-#endif
-}
-
-
-/**
- * Initialize a gl_array_object's arrays.
- */
-void
-_mesa_initialize_array_object( struct gl_context *ctx,
-			       struct gl_array_object *obj,
-			       GLuint name )
-{
-   GLuint i;
-
-   obj->Name = name;
-
-   _glthread_INIT_MUTEX(obj->Mutex);
-   obj->RefCount = 1;
-
-   /* Init the individual arrays */
-   init_array(ctx, &obj->Vertex, 4, GL_FLOAT);
-   init_array(ctx, &obj->Weight, 1, GL_FLOAT);
-   init_array(ctx, &obj->Normal, 3, GL_FLOAT);
-   init_array(ctx, &obj->Color, 4, GL_FLOAT);
-   init_array(ctx, &obj->SecondaryColor, 3, GL_FLOAT);
-   init_array(ctx, &obj->FogCoord, 1, GL_FLOAT);
-   init_array(ctx, &obj->Index, 1, GL_FLOAT);
-   for (i = 0; i < Elements(obj->TexCoord); i++) {
-      init_array(ctx, &obj->TexCoord[i], 4, GL_FLOAT);
-   }
-   init_array(ctx, &obj->EdgeFlag, 1, GL_BOOL);
-   for (i = 0; i < Elements(obj->VertexAttrib); i++) {
-      init_array(ctx, &obj->VertexAttrib[i], 4, GL_FLOAT);
-   }
-
-#if FEATURE_point_size_array
-   init_array(ctx, &obj->PointSize, 1, GL_FLOAT);
-#endif
-}
-
-
-/**
- * Add the given array object to the array object pool.
- */
-static void
-save_array_object( struct gl_context *ctx, struct gl_array_object *obj )
-{
-   if (obj->Name > 0) {
-      /* insert into hash table */
-      _mesa_HashInsert(ctx->Array.Objects, obj->Name, obj);
-   }
-}
-
-
-/**
- * Remove the given array object from the array object pool.
- * Do not deallocate the array object though.
- */
-static void
-remove_array_object( struct gl_context *ctx, struct gl_array_object *obj )
-{
-   if (obj->Name > 0) {
-      /* remove from hash table */
-      _mesa_HashRemove(ctx->Array.Objects, obj->Name);
-   }
-}
-
-
-
-/**
- * Compute the index of the last array element that can be safely accessed
- * in a vertex array.  We can really only do this when the array lives in
- * a VBO.
- * The array->_MaxElement field will be updated.
- * Later in glDrawArrays/Elements/etc we can do some bounds checking.
- */
-static void
-compute_max_element(struct gl_client_array *array)
-{
-   if (array->BufferObj->Name) {
-      /* Compute the max element we can access in the VBO without going
-       * out of bounds.
-       */
-      array->_MaxElement = ((GLsizeiptrARB) array->BufferObj->Size
-                            - (GLsizeiptrARB) array->Ptr + array->StrideB
-                            - array->_ElementSize) / array->StrideB;
-      if (0)
-         printf("%s Object %u  Size %u  MaxElement %u\n",
-		__FUNCTION__,
-		array->BufferObj->Name,
-		(GLuint) array->BufferObj->Size,
-		array->_MaxElement);
-   }
-   else {
-      /* user-space array, no idea how big it is */
-      array->_MaxElement = 2 * 1000 * 1000 * 1000; /* just a big number */
-   }
-}
-
-
-/**
- * Helper for update_arrays().
- * \return  min(current min, array->_MaxElement).
- */
-static GLuint
-update_min(GLuint min, struct gl_client_array *array)
-{
-   compute_max_element(array);
-   if (array->Enabled)
-      return MIN2(min, array->_MaxElement);
-   else
-      return min;
-}
-
-
-/**
- * Examine vertex arrays to update the gl_array_object::_MaxElement field.
- */
-void
-_mesa_update_array_object_max_element(struct gl_context *ctx,
-                                      struct gl_array_object *arrayObj)
-{
-   GLuint i, min = ~0;
-
-   min = update_min(min, &arrayObj->Vertex);
-   min = update_min(min, &arrayObj->Weight);
-   min = update_min(min, &arrayObj->Normal);
-   min = update_min(min, &arrayObj->Color);
-   min = update_min(min, &arrayObj->SecondaryColor);
-   min = update_min(min, &arrayObj->FogCoord);
-   min = update_min(min, &arrayObj->Index);
-   min = update_min(min, &arrayObj->EdgeFlag);
-#if FEATURE_point_size_array
-   min = update_min(min, &arrayObj->PointSize);
-#endif
-   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++)
-      min = update_min(min, &arrayObj->TexCoord[i]);
-   for (i = 0; i < Elements(arrayObj->VertexAttrib); i++)
-      min = update_min(min, &arrayObj->VertexAttrib[i]);
-
-   /* _MaxElement is one past the last legal array element */
-   arrayObj->_MaxElement = min;
-}
-
-
-/**********************************************************************/
-/* API Functions                                                      */
-/**********************************************************************/
-
-
-/**
- * Helper for _mesa_BindVertexArray() and _mesa_BindVertexArrayAPPLE().
- * \param genRequired  specifies behavour when id was not generated with
- *                     glGenVertexArrays().
- */
-static void
-bind_vertex_array(struct gl_context *ctx, GLuint id, GLboolean genRequired)
-{
-   struct gl_array_object * const oldObj = ctx->Array.ArrayObj;
-   struct gl_array_object *newObj = NULL;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   ASSERT(oldObj != NULL);
-
-   if ( oldObj->Name == id )
-      return;   /* rebinding the same array object- no change */
-
-   /*
-    * Get pointer to new array object (newObj)
-    */
-   if (id == 0) {
-      /* The spec says there is no array object named 0, but we use
-       * one internally because it simplifies things.
-       */
-      newObj = ctx->Array.DefaultArrayObj;
-   }
-   else {
-      /* non-default array object */
-      newObj = lookup_arrayobj(ctx, id);
-      if (!newObj) {
-         if (genRequired) {
-            _mesa_error(ctx, GL_INVALID_OPERATION, "glBindVertexArray(id)");
-            return;
-         }
-
-         /* For APPLE version, generate a new array object now */
-	 newObj = (*ctx->Driver.NewArrayObject)(ctx, id);
-         if (!newObj) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindVertexArrayAPPLE");
-            return;
-         }
-         save_array_object(ctx, newObj);
-      }
-   }
-
-   ctx->NewState |= _NEW_ARRAY;
-   ctx->Array.NewState |= _NEW_ARRAY_ALL;
-   _mesa_reference_array_object(ctx, &ctx->Array.ArrayObj, newObj);
-
-   /* Pass BindVertexArray call to device driver */
-   if (ctx->Driver.BindArrayObject && newObj)
-      ctx->Driver.BindArrayObject(ctx, newObj);
-}
-
-
-/**
- * ARB version of glBindVertexArray()
- * This function behaves differently from glBindVertexArrayAPPLE() in
- * that this function requires all ids to have been previously generated
- * by glGenVertexArrays[APPLE]().
- */
-void GLAPIENTRY
-_mesa_BindVertexArray( GLuint id )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   bind_vertex_array(ctx, id, GL_TRUE);
-}
-
-
-/**
- * Bind a new array.
- *
- * \todo
- * The binding could be done more efficiently by comparing the non-NULL
- * pointers in the old and new objects.  The only arrays that are "dirty" are
- * the ones that are non-NULL in either object.
- */
-void GLAPIENTRY
-_mesa_BindVertexArrayAPPLE( GLuint id )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   bind_vertex_array(ctx, id, GL_FALSE);
-}
-
-
-/**
- * Delete a set of array objects.
- * 
- * \param n      Number of array objects to delete.
- * \param ids    Array of \c n array object IDs.
- */
-void GLAPIENTRY
-_mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLsizei i;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteVertexArrayAPPLE(n)");
-      return;
-   }
-
-   for (i = 0; i < n; i++) {
-      struct gl_array_object *obj = lookup_arrayobj(ctx, ids[i]);
-
-      if ( obj != NULL ) {
-	 ASSERT( obj->Name == ids[i] );
-
-	 /* If the array object is currently bound, the spec says "the binding
-	  * for that object reverts to zero and the default vertex array
-	  * becomes current."
-	  */
-	 if ( obj == ctx->Array.ArrayObj ) {
-	    CALL_BindVertexArrayAPPLE( ctx->Exec, (0) );
-	 }
-
-	 /* The ID is immediately freed for re-use */
-	 remove_array_object(ctx, obj);
-
-         /* Unreference the array object. 
-          * If refcount hits zero, the object will be deleted.
-          */
-         _mesa_reference_array_object(ctx, &obj, NULL);
-      }
-   }
-}
-
-
-/**
- * Generate a set of unique array object IDs and store them in \c arrays.
- * Helper for _mesa_GenVertexArrays[APPLE]() functions below.
- * \param n       Number of IDs to generate.
- * \param arrays  Array of \c n locations to store the IDs.
- * \param vboOnly Will arrays have to reside in VBOs?
- */
-static void 
-gen_vertex_arrays(struct gl_context *ctx, GLsizei n, GLuint *arrays, GLboolean vboOnly)
-{
-   GLuint first;
-   GLint i;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (n < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glGenVertexArraysAPPLE");
-      return;
-   }
-
-   if (!arrays) {
-      return;
-   }
-
-   first = _mesa_HashFindFreeKeyBlock(ctx->Array.Objects, n);
-
-   /* Allocate new, empty array objects and return identifiers */
-   for (i = 0; i < n; i++) {
-      struct gl_array_object *obj;
-      GLuint name = first + i;
-
-      obj = (*ctx->Driver.NewArrayObject)( ctx, name );
-      if (!obj) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenVertexArraysAPPLE");
-         return;
-      }
-      obj->VBOonly = vboOnly;
-      save_array_object(ctx, obj);
-      arrays[i] = first + i;
-   }
-}
-
-
-/**
- * ARB version of glGenVertexArrays()
- * All arrays will be required to live in VBOs.
- */
-void GLAPIENTRY
-_mesa_GenVertexArrays(GLsizei n, GLuint *arrays)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   gen_vertex_arrays(ctx, n, arrays, GL_TRUE);
-}
-
-
-/**
- * APPLE version of glGenVertexArraysAPPLE()
- * Arrays may live in VBOs or ordinary memory.
- */
-void GLAPIENTRY
-_mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   gen_vertex_arrays(ctx, n, arrays, GL_FALSE);
-}
-
-
-/**
- * Determine if ID is the name of an array object.
- * 
- * \param id  ID of the potential array object.
- * \return  \c GL_TRUE if \c id is the name of a array object, 
- *          \c GL_FALSE otherwise.
- */
-GLboolean GLAPIENTRY
-_mesa_IsVertexArrayAPPLE( GLuint id )
-{
-   struct gl_array_object * obj;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
-
-   if (id == 0)
-      return GL_FALSE;
-
-   obj = lookup_arrayobj(ctx, id);
-
-   return (obj != NULL) ? GL_TRUE : GL_FALSE;
-}
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.6

+ *

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

+ * (C) Copyright IBM Corporation 2006

+ * 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 OR IBM 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 arrayobj.c

+ * Functions for the GL_APPLE_vertex_array_object extension.

+ *

+ * \todo

+ * The code in this file borrows a lot from bufferobj.c.  There's a certain

+ * amount of cruft left over from that origin that may be unnecessary.

+ *

+ * \author Ian Romanick <idr@us.ibm.com>

+ * \author Brian Paul

+ */

+

+

+#include "glheader.h"

+#include "hash.h"

+#include "imports.h"

+#include "context.h"

+#include "mfeatures.h"

+#if FEATURE_ARB_vertex_buffer_object

+#include "bufferobj.h"

+#endif

+#include "arrayobj.h"

+#include "macros.h"

+#include "mtypes.h"

+#include "main/dispatch.h"

+

+

+/**

+ * Look up the array object for the given ID.

+ * 

+ * \returns

+ * Either a pointer to the array object with the specified ID or \c NULL for

+ * a non-existent ID.  The spec defines ID 0 as being technically

+ * non-existent.

+ */

+

+static INLINE struct gl_array_object *

+lookup_arrayobj(struct gl_context *ctx, GLuint id)

+{

+   if (id == 0)

+      return NULL;

+   else

+      return (struct gl_array_object *)

+         _mesa_HashLookup(ctx->Array.Objects, id);

+}

+

+

+/**

+ * For all the vertex arrays in the array object, unbind any pointers

+ * to any buffer objects (VBOs).

+ * This is done just prior to array object destruction.

+ */

+static void

+unbind_array_object_vbos(struct gl_context *ctx, struct gl_array_object *obj)

+{

+   GLuint i;

+

+   _mesa_reference_buffer_object(ctx, &obj->Vertex.BufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &obj->Weight.BufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &obj->Normal.BufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &obj->Color.BufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &obj->SecondaryColor.BufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &obj->FogCoord.BufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &obj->Index.BufferObj, NULL);

+   _mesa_reference_buffer_object(ctx, &obj->EdgeFlag.BufferObj, NULL);

+

+   for (i = 0; i < Elements(obj->TexCoord); i++)

+      _mesa_reference_buffer_object(ctx, &obj->TexCoord[i].BufferObj, NULL);

+

+   for (i = 0; i < Elements(obj->VertexAttrib); i++)

+      _mesa_reference_buffer_object(ctx, &obj->VertexAttrib[i].BufferObj,NULL);

+

+#if FEATURE_point_size_array

+   _mesa_reference_buffer_object(ctx, &obj->PointSize.BufferObj, NULL);

+#endif

+}

+

+

+/**

+ * Allocate and initialize a new vertex array object.

+ * 

+ * This function is intended to be called via

+ * \c dd_function_table::NewArrayObject.

+ */

+struct gl_array_object *

+_mesa_new_array_object( struct gl_context *ctx, GLuint name )

+{

+   struct gl_array_object *obj = CALLOC_STRUCT(gl_array_object);

+   if (obj)

+      _mesa_initialize_array_object(ctx, obj, name);

+   return obj;

+}

+

+

+/**

+ * Delete an array object.

+ * 

+ * This function is intended to be called via

+ * \c dd_function_table::DeleteArrayObject.

+ */

+void

+_mesa_delete_array_object( struct gl_context *ctx, struct gl_array_object *obj )

+{

+   (void) ctx;

+   unbind_array_object_vbos(ctx, obj);

+   _glthread_DESTROY_MUTEX(obj->Mutex);

+   free(obj);

+}

+

+

+/**

+ * Set ptr to arrayObj w/ reference counting.

+ */

+void

+_mesa_reference_array_object(struct gl_context *ctx,

+                             struct gl_array_object **ptr,

+                             struct gl_array_object *arrayObj)

+{

+   if (*ptr == arrayObj)

+      return;

+

+   if (*ptr) {

+      /* Unreference the old array object */

+      GLboolean deleteFlag = GL_FALSE;

+      struct gl_array_object *oldObj = *ptr;

+

+      _glthread_LOCK_MUTEX(oldObj->Mutex);

+      ASSERT(oldObj->RefCount > 0);

+      oldObj->RefCount--;

+#if 0

+      printf("ArrayObj %p %d DECR to %d\n",

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

+#endif

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

+      _glthread_UNLOCK_MUTEX(oldObj->Mutex);

+

+      if (deleteFlag) {

+	 ASSERT(ctx->Driver.DeleteArrayObject);

+         ctx->Driver.DeleteArrayObject(ctx, oldObj);

+      }

+

+      *ptr = NULL;

+   }

+   ASSERT(!*ptr);

+

+   if (arrayObj) {

+      /* reference new array object */

+      _glthread_LOCK_MUTEX(arrayObj->Mutex);

+      if (arrayObj->RefCount == 0) {

+         /* this array's being deleted (look just above) */

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

+         _mesa_problem(NULL, "referencing deleted array object");

+         *ptr = NULL;

+      }

+      else {

+         arrayObj->RefCount++;

+#if 0

+         printf("ArrayObj %p %d INCR to %d\n",

+                (void *) arrayObj, arrayObj->Name, arrayObj->RefCount);

+#endif

+         *ptr = arrayObj;

+      }

+      _glthread_UNLOCK_MUTEX(arrayObj->Mutex);

+   }

+}

+

+

+

+static void

+init_array(struct gl_context *ctx,

+           struct gl_client_array *array, GLint size, GLint type)

+{

+   array->Size = size;

+   array->Type = type;

+   array->Format = GL_RGBA; /* only significant for GL_EXT_vertex_array_bgra */

+   array->Stride = 0;

+   array->StrideB = 0;

+   array->Ptr = NULL;

+   array->Enabled = GL_FALSE;

+   array->Normalized = GL_FALSE;

+#if FEATURE_ARB_vertex_buffer_object

+   /* Vertex array buffers */

+   _mesa_reference_buffer_object(ctx, &array->BufferObj,

+                                 ctx->Shared->NullBufferObj);

+#endif

+}

+

+

+/**

+ * Initialize a gl_array_object's arrays.

+ */

+void

+_mesa_initialize_array_object( struct gl_context *ctx,

+			       struct gl_array_object *obj,

+			       GLuint name )

+{

+   GLuint i;

+

+   obj->Name = name;

+

+   _glthread_INIT_MUTEX(obj->Mutex);

+   obj->RefCount = 1;

+

+   /* Init the individual arrays */

+   init_array(ctx, &obj->Vertex, 4, GL_FLOAT);

+   init_array(ctx, &obj->Weight, 1, GL_FLOAT);

+   init_array(ctx, &obj->Normal, 3, GL_FLOAT);

+   init_array(ctx, &obj->Color, 4, GL_FLOAT);

+   init_array(ctx, &obj->SecondaryColor, 3, GL_FLOAT);

+   init_array(ctx, &obj->FogCoord, 1, GL_FLOAT);

+   init_array(ctx, &obj->Index, 1, GL_FLOAT);

+   for (i = 0; i < Elements(obj->TexCoord); i++) {

+      init_array(ctx, &obj->TexCoord[i], 4, GL_FLOAT);

+   }

+   init_array(ctx, &obj->EdgeFlag, 1, GL_BOOL);

+   for (i = 0; i < Elements(obj->VertexAttrib); i++) {

+      init_array(ctx, &obj->VertexAttrib[i], 4, GL_FLOAT);

+   }

+

+#if FEATURE_point_size_array

+   init_array(ctx, &obj->PointSize, 1, GL_FLOAT);

+#endif

+}

+

+

+/**

+ * Add the given array object to the array object pool.

+ */

+static void

+save_array_object( struct gl_context *ctx, struct gl_array_object *obj )

+{

+   if (obj->Name > 0) {

+      /* insert into hash table */

+      _mesa_HashInsert(ctx->Array.Objects, obj->Name, obj);

+   }

+}

+

+

+/**

+ * Remove the given array object from the array object pool.

+ * Do not deallocate the array object though.

+ */

+static void

+remove_array_object( struct gl_context *ctx, struct gl_array_object *obj )

+{

+   if (obj->Name > 0) {

+      /* remove from hash table */

+      _mesa_HashRemove(ctx->Array.Objects, obj->Name);

+   }

+}

+

+

+

+/**

+ * Compute the index of the last array element that can be safely accessed

+ * in a vertex array.  We can really only do this when the array lives in

+ * a VBO.

+ * The array->_MaxElement field will be updated.

+ * Later in glDrawArrays/Elements/etc we can do some bounds checking.

+ */

+static void

+compute_max_element(struct gl_client_array *array)

+{

+   if (array->BufferObj->Name) {

+      /* Compute the max element we can access in the VBO without going

+       * out of bounds.

+       */

+      array->_MaxElement = ((GLsizeiptrARB) array->BufferObj->Size

+                            - (GLsizeiptrARB) array->Ptr + array->StrideB

+                            - array->_ElementSize) / array->StrideB;

+      if (0)

+         printf("%s Object %u  Size %u  MaxElement %u\n",

+		__FUNCTION__,

+		array->BufferObj->Name,

+		(GLuint) array->BufferObj->Size,

+		array->_MaxElement);

+   }

+   else {

+      /* user-space array, no idea how big it is */

+      array->_MaxElement = 2 * 1000 * 1000 * 1000; /* just a big number */

+   }

+}

+

+

+/**

+ * Helper for update_arrays().

+ * \return  min(current min, array->_MaxElement).

+ */

+static GLuint

+update_min(GLuint min, struct gl_client_array *array)

+{

+   compute_max_element(array);

+   if (array->Enabled)

+      return MIN2(min, array->_MaxElement);

+   else

+      return min;

+}

+

+

+/**

+ * Examine vertex arrays to update the gl_array_object::_MaxElement field.

+ */

+void

+_mesa_update_array_object_max_element(struct gl_context *ctx,

+                                      struct gl_array_object *arrayObj)

+{

+   GLuint i, min = ~0;

+

+   min = update_min(min, &arrayObj->Vertex);

+   min = update_min(min, &arrayObj->Weight);

+   min = update_min(min, &arrayObj->Normal);

+   min = update_min(min, &arrayObj->Color);

+   min = update_min(min, &arrayObj->SecondaryColor);

+   min = update_min(min, &arrayObj->FogCoord);

+   min = update_min(min, &arrayObj->Index);

+   min = update_min(min, &arrayObj->EdgeFlag);

+#if FEATURE_point_size_array

+   min = update_min(min, &arrayObj->PointSize);

+#endif

+   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++)

+      min = update_min(min, &arrayObj->TexCoord[i]);

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

+      min = update_min(min, &arrayObj->VertexAttrib[i]);

+

+   /* _MaxElement is one past the last legal array element */

+   arrayObj->_MaxElement = min;

+}

+

+

+/**********************************************************************/

+/* API Functions                                                      */

+/**********************************************************************/

+

+

+/**

+ * Helper for _mesa_BindVertexArray() and _mesa_BindVertexArrayAPPLE().

+ * \param genRequired  specifies behavour when id was not generated with

+ *                     glGenVertexArrays().

+ */

+static void

+bind_vertex_array(struct gl_context *ctx, GLuint id, GLboolean genRequired)

+{

+   struct gl_array_object * const oldObj = ctx->Array.ArrayObj;

+   struct gl_array_object *newObj = NULL;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   ASSERT(oldObj != NULL);

+

+   if ( oldObj->Name == id )

+      return;   /* rebinding the same array object- no change */

+

+   /*

+    * Get pointer to new array object (newObj)

+    */

+   if (id == 0) {

+      /* The spec says there is no array object named 0, but we use

+       * one internally because it simplifies things.

+       */

+      newObj = ctx->Array.DefaultArrayObj;

+   }

+   else {

+      /* non-default array object */

+      newObj = lookup_arrayobj(ctx, id);

+      if (!newObj) {

+         if (genRequired) {

+            _mesa_error(ctx, GL_INVALID_OPERATION, "glBindVertexArray(id)");

+            return;

+         }

+

+         /* For APPLE version, generate a new array object now */

+	 newObj = (*ctx->Driver.NewArrayObject)(ctx, id);

+         if (!newObj) {

+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindVertexArrayAPPLE");

+            return;

+         }

+         save_array_object(ctx, newObj);

+      }

+   }

+

+   ctx->NewState |= _NEW_ARRAY;

+   ctx->Array.NewState |= _NEW_ARRAY_ALL;

+   _mesa_reference_array_object(ctx, &ctx->Array.ArrayObj, newObj);

+

+   /* Pass BindVertexArray call to device driver */

+   if (ctx->Driver.BindArrayObject && newObj)

+      ctx->Driver.BindArrayObject(ctx, newObj);

+}

+

+

+/**

+ * ARB version of glBindVertexArray()

+ * This function behaves differently from glBindVertexArrayAPPLE() in

+ * that this function requires all ids to have been previously generated

+ * by glGenVertexArrays[APPLE]().

+ */

+void GLAPIENTRY

+_mesa_BindVertexArray( GLuint id )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   bind_vertex_array(ctx, id, GL_TRUE);

+}

+

+

+/**

+ * Bind a new array.

+ *

+ * \todo

+ * The binding could be done more efficiently by comparing the non-NULL

+ * pointers in the old and new objects.  The only arrays that are "dirty" are

+ * the ones that are non-NULL in either object.

+ */

+void GLAPIENTRY

+_mesa_BindVertexArrayAPPLE( GLuint id )

+{

+   GET_CURRENT_CONTEXT(ctx);

+   bind_vertex_array(ctx, id, GL_FALSE);

+}

+

+

+/**

+ * Delete a set of array objects.

+ * 

+ * \param n      Number of array objects to delete.

+ * \param ids    Array of \c n array object IDs.

+ */

+void GLAPIENTRY

+_mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   GLsizei i;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (n < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteVertexArrayAPPLE(n)");

+      return;

+   }

+

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

+      struct gl_array_object *obj = lookup_arrayobj(ctx, ids[i]);

+

+      if ( obj != NULL ) {

+	 ASSERT( obj->Name == ids[i] );

+

+	 /* If the array object is currently bound, the spec says "the binding

+	  * for that object reverts to zero and the default vertex array

+	  * becomes current."

+	  */

+	 if ( obj == ctx->Array.ArrayObj ) {

+	    CALL_BindVertexArrayAPPLE( ctx->Exec, (0) );

+	 }

+

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

+	 remove_array_object(ctx, obj);

+

+         /* Unreference the array object. 

+          * If refcount hits zero, the object will be deleted.

+          */

+         _mesa_reference_array_object(ctx, &obj, NULL);

+      }

+   }

+}

+

+

+/**

+ * Generate a set of unique array object IDs and store them in \c arrays.

+ * Helper for _mesa_GenVertexArrays[APPLE]() functions below.

+ * \param n       Number of IDs to generate.

+ * \param arrays  Array of \c n locations to store the IDs.

+ * \param vboOnly Will arrays have to reside in VBOs?

+ */

+static void 

+gen_vertex_arrays(struct gl_context *ctx, GLsizei n, GLuint *arrays,

+                  GLboolean vboOnly)

+{

+   GLuint first;

+   GLint i;

+   ASSERT_OUTSIDE_BEGIN_END(ctx);

+

+   if (n < 0) {

+      _mesa_error(ctx, GL_INVALID_VALUE, "glGenVertexArraysAPPLE");

+      return;

+   }

+

+   if (!arrays) {

+      return;

+   }

+

+   first = _mesa_HashFindFreeKeyBlock(ctx->Array.Objects, n);

+

+   /* Allocate new, empty array objects and return identifiers */

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

+      struct gl_array_object *obj;

+      GLuint name = first + i;

+

+      obj = (*ctx->Driver.NewArrayObject)( ctx, name );

+      if (!obj) {

+         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenVertexArraysAPPLE");

+         return;

+      }

+      obj->VBOonly = vboOnly;

+      save_array_object(ctx, obj);

+      arrays[i] = first + i;

+   }

+}

+

+

+/**

+ * ARB version of glGenVertexArrays()

+ * All arrays will be required to live in VBOs.

+ */

+void GLAPIENTRY

+_mesa_GenVertexArrays(GLsizei n, GLuint *arrays)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   gen_vertex_arrays(ctx, n, arrays, GL_TRUE);

+}

+

+

+/**

+ * APPLE version of glGenVertexArraysAPPLE()

+ * Arrays may live in VBOs or ordinary memory.

+ */

+void GLAPIENTRY

+_mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)

+{

+   GET_CURRENT_CONTEXT(ctx);

+   gen_vertex_arrays(ctx, n, arrays, GL_FALSE);

+}

+

+

+/**

+ * Determine if ID is the name of an array object.

+ * 

+ * \param id  ID of the potential array object.

+ * \return  \c GL_TRUE if \c id is the name of a array object, 

+ *          \c GL_FALSE otherwise.

+ */

+GLboolean GLAPIENTRY

+_mesa_IsVertexArrayAPPLE( GLuint id )

+{

+   struct gl_array_object * obj;

+   GET_CURRENT_CONTEXT(ctx);

+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

+

+   if (id == 0)

+      return GL_FALSE;

+

+   obj = lookup_arrayobj(ctx, id);

+

+   return (obj != NULL) ? GL_TRUE : GL_FALSE;

+}

diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index ce3bf86fb..349288e73 100644
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -216,7 +216,8 @@ _mesa_new_buffer_object( struct gl_context *ctx, GLuint name, GLenum target )
  * Default callback for the \c dd_function_table::DeleteBuffer() hook.

  */

 void

-_mesa_delete_buffer_object( struct gl_context *ctx, struct gl_buffer_object *bufObj )

+_mesa_delete_buffer_object(struct gl_context *ctx,

+                           struct gl_buffer_object *bufObj)

 {

    (void) ctx;

 

@@ -414,7 +415,8 @@ _mesa_buffer_subdata( struct gl_context *ctx, GLenum target, GLintptrARB offset,
  * \sa glBufferGetSubDataARB, dd_function_table::GetBufferSubData.

  */

 void

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

+_mesa_buffer_get_subdata( struct gl_context *ctx,

+                          GLenum target, GLintptrARB offset,

 			  GLsizeiptrARB size, GLvoid * data,

 			  struct gl_buffer_object * bufObj )

 {

@@ -1536,7 +1538,7 @@ _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 

 #if FEATURE_APPLE_object_purgeable

 static GLenum

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

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

 {

    struct gl_buffer_object *bufObj;

    GLenum retval;

@@ -1569,7 +1571,7 @@ _mesa_BufferObjectPurgeable(struct gl_context *ctx, GLuint name, GLenum option)
 

 

 static GLenum

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

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

 {

    struct gl_renderbuffer *bufObj;

    GLenum retval;

@@ -1598,7 +1600,7 @@ _mesa_RenderObjectPurgeable(struct gl_context *ctx, GLuint name, GLenum option)
 

 

 static GLenum

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

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

 {

    struct gl_texture_object *bufObj;

    GLenum retval;

@@ -1654,13 +1656,13 @@ _mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
 

    switch (objectType) {

    case GL_TEXTURE:

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

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

       break;

    case GL_RENDERBUFFER_EXT:

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

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

       break;

    case GL_BUFFER_OBJECT_APPLE:

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

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

       break;

    default:

       _mesa_error(ctx, GL_INVALID_ENUM,

@@ -1679,7 +1681,7 @@ _mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
 

 

 static GLenum

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

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

 {

    struct gl_buffer_object *bufObj;

    GLenum retval;

@@ -1709,7 +1711,7 @@ _mesa_BufferObjectUnpurgeable(struct gl_context *ctx, GLuint name, GLenum option
 

 

 static GLenum

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

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

 {

    struct gl_renderbuffer *bufObj;

    GLenum retval;

@@ -1739,7 +1741,7 @@ _mesa_RenderObjectUnpurgeable(struct gl_context *ctx, GLuint name, GLenum option
 

 

 static GLenum

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

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

 {

    struct gl_texture_object *bufObj;

    GLenum retval;

@@ -1794,11 +1796,11 @@ _mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
 

    switch (objectType) {

    case GL_BUFFER_OBJECT_APPLE:

-      return _mesa_BufferObjectUnpurgeable(ctx, name, option);

+      return buffer_object_unpurgeable(ctx, name, option);

    case GL_TEXTURE:

-      return _mesa_TextureObjectUnpurgeable(ctx, name, option);

+      return texture_object_unpurgeable(ctx, name, option);

    case GL_RENDERBUFFER_EXT:

-      return _mesa_RenderObjectUnpurgeable(ctx, name, option);

+      return renderbuffer_unpurgeable(ctx, name, option);

    default:

       _mesa_error(ctx, GL_INVALID_ENUM,

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

@@ -1809,12 +1811,10 @@ _mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
 

 

 static void

-_mesa_GetBufferObjectParameterivAPPLE(struct gl_context *ctx, GLuint name,

-                                      GLenum pname, GLint* params)

+get_buffer_object_parameteriv(struct gl_context *ctx, GLuint name,

+                              GLenum pname, GLint *params)

 {

-   struct gl_buffer_object *bufObj;

-

-   bufObj = _mesa_lookup_bufferobj(ctx, name);

+   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);

@@ -1835,13 +1835,11 @@ _mesa_GetBufferObjectParameterivAPPLE(struct gl_context *ctx, GLuint name,
 

 

 static void

-_mesa_GetRenderObjectParameterivAPPLE(struct gl_context *ctx, GLuint name,

-                                      GLenum pname, GLint* params)

+get_renderbuffer_parameteriv(struct gl_context *ctx, GLuint name,

+                             GLenum pname, GLint *params)

 {

-   struct gl_renderbuffer *bufObj;

-

-   bufObj = _mesa_lookup_renderbuffer(ctx, name);

-   if (!bufObj) {

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

+   if (!rb) {

       _mesa_error(ctx, GL_INVALID_VALUE,

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

       return;

@@ -1849,7 +1847,7 @@ _mesa_GetRenderObjectParameterivAPPLE(struct gl_context *ctx, GLuint name,
 

    switch (pname) {

    case GL_PURGEABLE_APPLE:

-      *params = bufObj->Purgeable;

+      *params = rb->Purgeable;

       break;

    default:

       _mesa_error(ctx, GL_INVALID_ENUM,

@@ -1861,13 +1859,11 @@ _mesa_GetRenderObjectParameterivAPPLE(struct gl_context *ctx, GLuint name,
 

 

 static void

-_mesa_GetTextureObjectParameterivAPPLE(struct gl_context *ctx, GLuint name,

-                                       GLenum pname, GLint* params)

+get_texture_object_parameteriv(struct gl_context *ctx, GLuint name,

+                               GLenum pname, GLint *params)

 {

-   struct gl_texture_object *bufObj;

-

-   bufObj = _mesa_lookup_texture(ctx, name);

-   if (!bufObj) {

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

+   if (!texObj) {

       _mesa_error(ctx, GL_INVALID_VALUE,

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

       return;

@@ -1875,7 +1871,7 @@ _mesa_GetTextureObjectParameterivAPPLE(struct gl_context *ctx, GLuint name,
 

    switch (pname) {

    case GL_PURGEABLE_APPLE:

-      *params = bufObj->Purgeable;

+      *params = texObj->Purgeable;

       break;

    default:

       _mesa_error(ctx, GL_INVALID_ENUM,

@@ -1888,7 +1884,7 @@ _mesa_GetTextureObjectParameterivAPPLE(struct gl_context *ctx, GLuint name,
 

 void GLAPIENTRY

 _mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname,

-                                GLint* params)

+                                GLint *params)

 {

    GET_CURRENT_CONTEXT(ctx);

 

@@ -1900,13 +1896,13 @@ _mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname,
 

    switch (objectType) {

    case GL_TEXTURE:

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

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

       break;

    case GL_BUFFER_OBJECT_APPLE:

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

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

       break;

    case GL_RENDERBUFFER_EXT:

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

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

       break;

    default:

       _mesa_error(ctx, GL_INVALID_ENUM,

diff --git a/mesalib/src/mesa/main/clip.c b/mesalib/src/mesa/main/clip.c
index bec04de72..6b9b3b58c 100644
--- a/mesalib/src/mesa/main/clip.c
+++ b/mesalib/src/mesa/main/clip.c
@@ -32,11 +32,20 @@
 #include "math/m_matrix.h"

 

 

+/**

+ * Update derived clip plane state.

+ */

+void

+_mesa_update_clip_plane(struct gl_context *ctx, GLuint plane)

+{

+   if (_math_matrix_is_dirty(ctx->ProjectionMatrixStack.Top))

+      _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );

 

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

-/*                     Get/Set User clip-planes.                      */

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

-

+   /* Clip-Space Plane = Eye-Space Plane * Projection Matrix */

+   _mesa_transform_vector(ctx->Transform._ClipUserPlane[plane],

+                          ctx->Transform.EyeUserPlane[plane],

+                          ctx->ProjectionMatrixStack.Top->inv);

+}

 

 

 void GLAPIENTRY

@@ -78,17 +87,8 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *eq )
    FLUSH_VERTICES(ctx, _NEW_TRANSFORM);

    COPY_4FV(ctx->Transform.EyeUserPlane[p], equation);

 

-   /* Update derived state.  This state also depends on the projection

-    * matrix, and is recalculated on changes to the projection matrix by

-    * code in _mesa_update_state().

-    */

    if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {

-      if (_math_matrix_is_dirty(ctx->ProjectionMatrixStack.Top))

-         _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );

-

-      _mesa_transform_vector( ctx->Transform._ClipUserPlane[p],

-			   ctx->Transform.EyeUserPlane[p],

-			   ctx->ProjectionMatrixStack.Top->inv );

+      _mesa_update_clip_plane(ctx, p);

    }

 

    if (ctx->Driver.ClipPlane)

diff --git a/mesalib/src/mesa/main/clip.h b/mesalib/src/mesa/main/clip.h
index bba16e11c..9a94542ec 100644
--- a/mesalib/src/mesa/main/clip.h
+++ b/mesalib/src/mesa/main/clip.h
@@ -33,6 +33,11 @@
 

 #include "glheader.h"

 

+struct gl_context;

+

+extern void

+_mesa_update_clip_plane(struct gl_context *ctx, GLuint plane);

+

 extern void GLAPIENTRY 

 _mesa_ClipPlane( GLenum plane, const GLdouble *equation );

 

diff --git a/mesalib/src/mesa/main/dd.h b/mesalib/src/mesa/main/dd.h
index c39e72048..972a90279 100644
--- a/mesalib/src/mesa/main/dd.h
+++ b/mesalib/src/mesa/main/dd.h
@@ -602,15 +602,6 @@ struct dd_function_table {
     */

    /*@{*/

    /**

-    * Called when a shader is compiled.

-    *

-    * Note that not all shader objects get ShaderCompile called on

-    * them.  Notably, the shaders containing builtin functions do not

-    * have CompileShader() called, so if lowering passes are done they

-    * need to also be performed in LinkShader().

-    */

-   GLboolean (*CompileShader)(struct gl_context *ctx, struct gl_shader *shader);

-   /**

     * Called when a shader program is linked.

     *

     * This gives drivers an opportunity to clone the IR and make their

diff --git a/mesalib/src/mesa/main/enable.c b/mesalib/src/mesa/main/enable.c
index 32c3c8713..8df3ac1f6 100644
--- a/mesalib/src/mesa/main/enable.c
+++ b/mesalib/src/mesa/main/enable.c
@@ -29,6 +29,7 @@
 

 

 #include "glheader.h"

+#include "clip.h"

 #include "context.h"

 #include "enable.h"

 #include "light.h"

@@ -213,8 +214,8 @@ _mesa_DisableClientState( GLenum cap )
 /**

  * Return pointer to current texture unit for setting/getting coordinate

  * state.

- * Note that we'll set GL_INVALID_OPERATION if the active texture unit is

- * higher than the number of supported coordinate units.  And we'll return NULL.

+ * Note that we'll set GL_INVALID_OPERATION and return NULL if the active

+ * texture unit is higher than the number of supported coordinate units.

  */

 static struct gl_texture_unit *

 get_texcoord_unit(struct gl_context *ctx)

@@ -286,7 +287,8 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
          break;

       case GL_BLEND:

          {

-            GLbitfield newEnabled = state * ((1 << ctx->Const.MaxDrawBuffers) - 1);

+            GLbitfield newEnabled =

+               state * ((1 << ctx->Const.MaxDrawBuffers) - 1);

             if (newEnabled != ctx->Color.BlendEnabled) {

                FLUSH_VERTICES(ctx, _NEW_COLOR);

                ctx->Color.BlendEnabled = newEnabled;

@@ -303,24 +305,15 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
          {

             const GLuint p = cap - GL_CLIP_PLANE0;

 

-            if ((ctx->Transform.ClipPlanesEnabled & (1 << p)) == ((GLuint) state << p))

+            if ((ctx->Transform.ClipPlanesEnabled & (1 << p))

+                == ((GLuint) state << p))

                return;

 

             FLUSH_VERTICES(ctx, _NEW_TRANSFORM);

 

             if (state) {

                ctx->Transform.ClipPlanesEnabled |= (1 << p);

-

-               if (_math_matrix_is_dirty(ctx->ProjectionMatrixStack.Top))

-                  _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );

-

-               /* This derived state also calculated in clip.c and

-                * from _mesa_update_state() on changes to EyeUserPlane

-                * and ctx->ProjectionMatrix respectively.

-                */

-               _mesa_transform_vector( ctx->Transform._ClipUserPlane[p],

-                                    ctx->Transform.EyeUserPlane[p],

-                                    ctx->ProjectionMatrixStack.Top->inv );

+               _mesa_update_clip_plane(ctx, p);

             }

             else {

                ctx->Transform.ClipPlanesEnabled &= ~(1 << p);

@@ -612,55 +605,17 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
             return;

          }

          break;

-      case GL_TEXTURE_GEN_Q:

-         {

-            struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

-            if (texUnit) {

-               GLuint newenabled = texUnit->TexGenEnabled & ~Q_BIT;

-               if (state)

-                  newenabled |= Q_BIT;

-               if (texUnit->TexGenEnabled == newenabled)

-                  return;

-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);

-               texUnit->TexGenEnabled = newenabled;

-            }

-         }

-         break;

-      case GL_TEXTURE_GEN_R:

-         {

-            struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

-            if (texUnit) {

-               GLuint newenabled = texUnit->TexGenEnabled & ~R_BIT;

-               if (state)

-                  newenabled |= R_BIT;

-               if (texUnit->TexGenEnabled == newenabled)

-                  return;

-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);

-               texUnit->TexGenEnabled = newenabled;

-            }

-         }

-         break;

       case GL_TEXTURE_GEN_S:

-         {

-            struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

-            if (texUnit) {

-               GLuint newenabled = texUnit->TexGenEnabled & ~S_BIT;

-               if (state)

-                  newenabled |= S_BIT;

-               if (texUnit->TexGenEnabled == newenabled)

-                  return;

-               FLUSH_VERTICES(ctx, _NEW_TEXTURE);

-               texUnit->TexGenEnabled = newenabled;

-            }

-         }

-         break;

       case GL_TEXTURE_GEN_T:

+      case GL_TEXTURE_GEN_R:

+      case GL_TEXTURE_GEN_Q:

          {

             struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

             if (texUnit) {

-               GLuint newenabled = texUnit->TexGenEnabled & ~T_BIT;

+               GLbitfield coordBit = S_BIT << (cap - GL_TEXTURE_GEN_S);

+               GLbitfield newenabled = texUnit->TexGenEnabled & ~coordBit;

                if (state)

-                  newenabled |= T_BIT;

+                  newenabled |= coordBit;

                if (texUnit->TexGenEnabled == newenabled)

                   return;

                FLUSH_VERTICES(ctx, _NEW_TEXTURE);

@@ -1012,7 +967,8 @@ _mesa_Disable( GLenum cap )
  * Enable/disable an indexed state var.

  */

 void

-_mesa_set_enablei(struct gl_context *ctx, GLenum cap, GLuint index, GLboolean state)

+_mesa_set_enablei(struct gl_context *ctx, GLenum cap,

+                  GLuint index, GLboolean state)

 {

    ASSERT(state == 0 || state == 1);

    switch (cap) {

@@ -1231,35 +1187,15 @@ _mesa_IsEnabled( GLenum cap )
          return is_texture_enabled(ctx, TEXTURE_2D_BIT);

       case GL_TEXTURE_3D:

          return is_texture_enabled(ctx, TEXTURE_3D_BIT);

-      case GL_TEXTURE_GEN_Q:

-         {

-            const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

-            if (texUnit) {

-               return (texUnit->TexGenEnabled & Q_BIT) ? GL_TRUE : GL_FALSE;

-            }

-         }

-         return GL_FALSE;

-      case GL_TEXTURE_GEN_R:

-         {

-            const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

-            if (texUnit) {

-               return (texUnit->TexGenEnabled & R_BIT) ? GL_TRUE : GL_FALSE;

-            }

-         }

-         return GL_FALSE;

       case GL_TEXTURE_GEN_S:

-         {

-            const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

-            if (texUnit) {

-               return (texUnit->TexGenEnabled & S_BIT) ? GL_TRUE : GL_FALSE;

-            }

-         }

-         return GL_FALSE;

       case GL_TEXTURE_GEN_T:

+      case GL_TEXTURE_GEN_R:

+      case GL_TEXTURE_GEN_Q:

          {

             const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

             if (texUnit) {

-               return (texUnit->TexGenEnabled & T_BIT) ? GL_TRUE : GL_FALSE;

+               GLbitfield coordBit = S_BIT << (cap - GL_TEXTURE_GEN_S);

+               return (texUnit->TexGenEnabled & coordBit) ? GL_TRUE : GL_FALSE;

             }

          }

          return GL_FALSE;

@@ -1268,7 +1204,8 @@ _mesa_IsEnabled( GLenum cap )
 	 {

             const struct gl_texture_unit *texUnit = get_texcoord_unit(ctx);

             if (texUnit) {

-		    return (texUnit->TexGenEnabled & STR_BITS) == STR_BITS ? GL_TRUE : GL_FALSE;

+               return (texUnit->TexGenEnabled & STR_BITS) == STR_BITS

+                  ? GL_TRUE : GL_FALSE;

             }

          }

 #endif

@@ -1285,7 +1222,8 @@ _mesa_IsEnabled( GLenum cap )
       case GL_INDEX_ARRAY:

          return (ctx->Array.ArrayObj->Index.Enabled != 0);

       case GL_TEXTURE_COORD_ARRAY:

-         return (ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Enabled != 0);

+         return (ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture]

+                 .Enabled != 0);

       case GL_EDGE_FLAG_ARRAY:

          return (ctx->Array.ArrayObj->EdgeFlag.Enabled != 0);

       case GL_FOG_COORDINATE_ARRAY_EXT:

diff --git a/mesalib/src/mesa/main/fog.c b/mesalib/src/mesa/main/fog.c
index b4356c198..70603576c 100644
--- a/mesalib/src/mesa/main/fog.c
+++ b/mesalib/src/mesa/main/fog.c
@@ -79,12 +79,17 @@ _mesa_Fogiv(GLenum pname, const GLint *params )
 }

 

 

-#define UPDATE_FOG_SCALE(ctx) do {\

-      if (ctx->Fog.End == ctx->Fog.Start)\

-         ctx->Fog._Scale = 1.0f;\

-      else\

-         ctx->Fog._Scale = 1.0f / (ctx->Fog.End - ctx->Fog.Start);\

-   } while(0)

+/**

+ * Update the gl_fog_attrib::_Scale field.

+ */

+static void

+update_fog_scale(struct gl_context *ctx)

+{

+   if (ctx->Fog.End == ctx->Fog.Start)

+      ctx->Fog._Scale = 1.0f;

+   else

+      ctx->Fog._Scale = 1.0f / (ctx->Fog.End - ctx->Fog.Start);

+}

 

 

 void GLAPIENTRY

@@ -126,14 +131,14 @@ _mesa_Fogfv( GLenum pname, const GLfloat *params )
             return;

          FLUSH_VERTICES(ctx, _NEW_FOG);

          ctx->Fog.Start = *params;

-         UPDATE_FOG_SCALE(ctx);

+         update_fog_scale(ctx);

          break;

       case GL_FOG_END:

          if (ctx->Fog.End == *params)

             return;

          FLUSH_VERTICES(ctx, _NEW_FOG);

          ctx->Fog.End = *params;

-         UPDATE_FOG_SCALE(ctx);

+         update_fog_scale(ctx);

          break;

       case GL_FOG_INDEX:

  	 if (ctx->Fog.Index == *params)

diff --git a/mesalib/src/mesa/main/imports.c b/mesalib/src/mesa/main/imports.c
index 3f856402f..2935525cc 100644
--- a/mesalib/src/mesa/main/imports.c
+++ b/mesalib/src/mesa/main/imports.c
@@ -930,14 +930,20 @@ _mesa_problem( const struct gl_context *ctx, const char *fmtString, ... )
 {

    va_list args;

    char str[MAXSTRING];

+   static int numCalls = 0;

+

    (void) ctx;

 

-   va_start( args, fmtString );  

-   vsnprintf( str, MAXSTRING, fmtString, args );

-   va_end( args );

+   if (numCalls < 50) {

+      numCalls++;

 

-   fprintf(stderr, "Mesa %s implementation error: %s\n", MESA_VERSION_STRING, str);

-   fprintf(stderr, "Please report at bugs.freedesktop.org\n");

+      va_start( args, fmtString );  

+      vsnprintf( str, MAXSTRING, fmtString, args );

+      va_end( args );

+      fprintf(stderr, "Mesa %s implementation error: %s\n",

+              MESA_VERSION_STRING, str);

+      fprintf(stderr, "Please report at bugs.freedesktop.org\n");

+   }

 }

 

 

diff --git a/mesalib/src/mesa/main/matrix.c b/mesalib/src/mesa/main/matrix.c
index 5ac6f8108..2579b7384 100644
--- a/mesalib/src/mesa/main/matrix.c
+++ b/mesalib/src/mesa/main/matrix.c
@@ -140,8 +140,8 @@ _mesa_Ortho( GLdouble left, GLdouble right,
  * \sa glMatrixMode().

  *

  * Flushes the vertices, validates the parameter and updates

- * __struct gl_contextRec::CurrentStack and gl_transform_attrib::MatrixMode with the

- * specified matrix stack.

+ * __struct gl_contextRec::CurrentStack and gl_transform_attrib::MatrixMode

+ * with the specified matrix stack.

  */

 void GLAPIENTRY

 _mesa_MatrixMode( GLenum mode )

@@ -170,7 +170,8 @@ _mesa_MatrixMode( GLenum mode )
        */

 #if 0

       if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {

-         _mesa_error(ctx, GL_INVALID_OPERATION, "glMatrixMode(invalid tex unit %d)",

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glMatrixMode(invalid tex unit %d)",

                      ctx->Texture.CurrentUnit);

          return;

       }

@@ -232,8 +233,8 @@ _mesa_MatrixMode( GLenum mode )
  * \sa glPushMatrix().

  * 

  * Verifies the current matrix stack is not full, and duplicates the top-most

- * matrix in the stack. Marks __struct gl_contextRec::NewState with the stack dirty

- * flag.

+ * matrix in the stack.

+ * Marks __struct gl_contextRec::NewState with the stack dirty flag.

  */

 void GLAPIENTRY

 _mesa_PushMatrix( void )

@@ -272,8 +273,8 @@ _mesa_PushMatrix( void )
  * \sa glPopMatrix().

  * 

  * Flushes the vertices, verifies the current matrix stack is not empty, and

- * moves the stack head down. Marks __struct gl_contextRec::NewState with the dirty

- * stack flag.

+ * moves the stack head down.

+ * Marks __struct gl_contextRec::NewState with the dirty stack flag.

  */

 void GLAPIENTRY

 _mesa_PopMatrix( void )

@@ -309,9 +310,9 @@ _mesa_PopMatrix( void )
  *

  * \sa glLoadIdentity().

  *

- * Flushes the vertices and calls _math_matrix_set_identity() with the top-most

- * matrix in the current stack. Marks __struct gl_contextRec::NewState with the stack

- * dirty flag.

+ * Flushes the vertices and calls _math_matrix_set_identity() with the

+ * top-most matrix in the current stack.

+ * Marks __struct gl_contextRec::NewState with the stack dirty flag.

  */

 void GLAPIENTRY

 _mesa_LoadIdentity( void )

@@ -334,9 +335,9 @@ _mesa_LoadIdentity( void )
  *

  * \sa glLoadMatrixf().

  *

- * Flushes the vertices and calls _math_matrix_loadf() with the top-most matrix

- * in the current stack and the given matrix. Marks __struct gl_contextRec::NewState

- * with the dirty stack flag.

+ * Flushes the vertices and calls _math_matrix_loadf() with the top-most

+ * matrix in the current stack and the given matrix.

+ * Marks __struct gl_contextRec::NewState with the dirty stack flag.

  */

 void GLAPIENTRY

 _mesa_LoadMatrixf( const GLfloat *m )

@@ -560,8 +561,8 @@ _mesa_MultTransposeMatrixdARB( const GLdouble *m )
  * Calls _math_matrix_analyse() with the top-matrix of the projection matrix

  * stack, and recomputes user clip positions if necessary.

  * 

- * \note This routine references __struct gl_contextRec::Tranform attribute values to

- * compute userclip positions in clip space, but is only called on

+ * \note This routine references __struct gl_contextRec::Tranform attribute

+ * values to compute userclip positions in clip space, but is only called on

  * _NEW_PROJECTION.  The _mesa_ClipPlane() function keeps these values up to

  * date across changes to the __struct gl_contextRec::Transform attributes.

  */

@@ -594,8 +595,8 @@ update_projection( struct gl_context *ctx )
  * \param ctx GL context.

  *

  * Multiplies the top matrices of the projection and model view stacks into

- * __struct gl_contextRec::_ModelProjectMatrix via _math_matrix_mul_matrix() and

- * analyzes the resulting matrix via _math_matrix_analyse().

+ * __struct gl_contextRec::_ModelProjectMatrix via _math_matrix_mul_matrix()

+ * and analyzes the resulting matrix via _math_matrix_analyse().

  */

 static void

 calculate_model_project_matrix( struct gl_context *ctx )

@@ -624,7 +625,7 @@ void _mesa_update_modelview_project( struct gl_context *ctx, GLuint new_state )
    if (new_state & _NEW_MODELVIEW) {

       _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );

     

-      /* Bring cull position uptodate.

+      /* Bring cull position up to date.

        */

       TRANSFORM_POINT3( ctx->Transform.CullObjPos, 

 			ctx->ModelviewMatrixStack.Top->inv,

@@ -635,7 +636,7 @@ void _mesa_update_modelview_project( struct gl_context *ctx, GLuint new_state )
    if (new_state & _NEW_PROJECTION)

       update_projection( ctx );

 

-   /* Keep ModelviewProject uptodate always to allow tnl

+   /* Keep ModelviewProject up to date always to allow tnl

     * implementations that go model->clip even when eye is required.

     */

    calculate_model_project_matrix(ctx);

diff --git a/mesalib/src/mesa/main/readpix.c b/mesalib/src/mesa/main/readpix.c
index e8b889d92..864e5b6dc 100644
--- a/mesalib/src/mesa/main/readpix.c
+++ b/mesalib/src/mesa/main/readpix.c
@@ -44,8 +44,8 @@
  * \return GL_TRUE if error detected, GL_FALSE if no errors

  */

 GLboolean

-_mesa_error_check_format_type(struct gl_context *ctx, GLenum format, GLenum type,

-                              GLboolean drawing)

+_mesa_error_check_format_type(struct gl_context *ctx, GLenum format,

+                              GLenum type, GLboolean drawing)

 {

    const char *readDraw = drawing ? "Draw" : "Read";

    const GLboolean reading = !drawing;

diff --git a/mesalib/src/mesa/main/shaderobj.c b/mesalib/src/mesa/main/shaderobj.c
index 06a2f53af..67dd5c9aa 100644
--- a/mesalib/src/mesa/main/shaderobj.c
+++ b/mesalib/src/mesa/main/shaderobj.c
@@ -410,6 +410,5 @@ _mesa_init_shader_object_functions(struct dd_function_table *driver)
    driver->DeleteShader = _mesa_delete_shader;

    driver->NewShaderProgram = _mesa_new_shader_program;

    driver->DeleteShaderProgram = _mesa_delete_shader_program;

-   driver->CompileShader = _mesa_ir_compile_shader;

    driver->LinkShader = _mesa_ir_link_shader;

 }

diff --git a/mesalib/src/mesa/main/texenv.c b/mesalib/src/mesa/main/texenv.c
index c802f6f3b..9caca7c11 100644
--- a/mesalib/src/mesa/main/texenv.c
+++ b/mesalib/src/mesa/main/texenv.c
@@ -411,9 +411,11 @@ set_combiner_scale(struct gl_context *ctx,
 void GLAPIENTRY

 _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )

 {

+   const GLint iparam0 = (GLint) param[0];

+   struct gl_texture_unit *texUnit;

    GLuint maxUnit;

+

    GET_CURRENT_CONTEXT(ctx);

-   struct gl_texture_unit *texUnit;

    ASSERT_OUTSIDE_BEGIN_END(ctx);

 

    maxUnit = (target == GL_POINT_SPRITE_NV && pname == GL_COORD_REPLACE_NV)

@@ -428,14 +430,14 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
    if (target == GL_TEXTURE_ENV) {

       switch (pname) {

       case GL_TEXTURE_ENV_MODE:

-         set_env_mode(ctx, texUnit, (GLenum) (GLint) param[0]);

+         set_env_mode(ctx, texUnit, (GLenum) iparam0);

          break;

       case GL_TEXTURE_ENV_COLOR:

          set_env_color(ctx, texUnit, param);

          break;

       case GL_COMBINE_RGB:

       case GL_COMBINE_ALPHA:

-         set_combiner_mode(ctx, texUnit, pname, (GLenum) (GLint) param[0]);

+         set_combiner_mode(ctx, texUnit, pname, (GLenum) iparam0);

 	 break;

       case GL_SOURCE0_RGB:

       case GL_SOURCE1_RGB:

@@ -445,7 +447,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
       case GL_SOURCE1_ALPHA:

       case GL_SOURCE2_ALPHA:

       case GL_SOURCE3_ALPHA_NV:

-         set_combiner_source(ctx, texUnit, pname, (GLenum) (GLint) param[0]);

+         set_combiner_source(ctx, texUnit, pname, (GLenum) iparam0);

 	 break;

       case GL_OPERAND0_RGB:

       case GL_OPERAND1_RGB:

@@ -455,7 +457,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
       case GL_OPERAND1_ALPHA:

       case GL_OPERAND2_ALPHA:

       case GL_OPERAND3_ALPHA_NV:

-         set_combiner_operand(ctx, texUnit, pname, (GLenum) (GLint) param[0]);

+         set_combiner_operand(ctx, texUnit, pname, (GLenum) iparam0);

 	 break;

       case GL_RGB_SCALE:

       case GL_ALPHA_SCALE:

@@ -466,19 +468,19 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
 	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(pname=0x%x)", pname );

 	    return;

 	 }

-	 if (((GLenum) (GLint) param[0] < GL_TEXTURE0) ||

-	 ((GLenum) (GLint) param[0] > GL_TEXTURE31)) {

+	 if ((iparam0 < GL_TEXTURE0) ||

+             (iparam0 > GL_TEXTURE31)) {

 	    /* spec doesn't say this but it seems logical */

-	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(param=0x%x)", (GLenum) (GLint) param[0]);

+	    _mesa_error( ctx, GL_INVALID_ENUM, "glTexEnv(param=0x%x)", iparam0);

 	    return;

 	 }

-	 if (!((1 << ((GLenum) (GLint) param[0] - GL_TEXTURE0)) & ctx->Const.SupportedBumpUnits)) {

-	    _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", (GLenum) (GLint) param[0]);

+	 if (!((1 << (iparam0 - GL_TEXTURE0)) & ctx->Const.SupportedBumpUnits)) {

+	    _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", iparam0);

 	    return;

 	 }

 	 else {

 	    FLUSH_VERTICES(ctx, _NEW_TEXTURE);

-	    texUnit->BumpTarget = (GLenum) (GLint) param[0];

+	    texUnit->BumpTarget = iparam0;

 	 }

 	 break;

       default:

@@ -511,19 +513,18 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
 	 return;

       }

       if (pname == GL_COORD_REPLACE_NV) {

-         const GLenum value = (GLenum) param[0];

-         if (value == GL_TRUE || value == GL_FALSE) {

+         if (iparam0 == GL_TRUE || iparam0 == GL_FALSE) {

             /* It's kind of weird to set point state via glTexEnv,

              * but that's what the spec calls for.

              */

-            const GLboolean state = (GLboolean) value;

+            const GLboolean state = (GLboolean) iparam0;

             if (ctx->Point.CoordReplace[ctx->Texture.CurrentUnit] == state)

                return;

             FLUSH_VERTICES(ctx, _NEW_POINT);

             ctx->Point.CoordReplace[ctx->Texture.CurrentUnit] = state;

          }

          else {

-            _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", value);

+            _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", iparam0);

             return;

          }

       }

@@ -542,7 +543,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
                   _mesa_lookup_enum_by_nr(target),

                   _mesa_lookup_enum_by_nr(pname),

                   *param,

-                  _mesa_lookup_enum_by_nr((GLenum) (GLint) *param));

+                  _mesa_lookup_enum_by_nr((GLenum) iparam0));

 

    /* Tell device driver about the new texture environment */

    if (ctx->Driver.TexEnv) {

diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp
index f88ef7a37..c1b28ec3f 100644
--- a/mesalib/src/mesa/program/ir_to_mesa.cpp
+++ b/mesalib/src/mesa/program/ir_to_mesa.cpp
@@ -3094,21 +3094,6 @@ get_mesa_program(struct gl_context *ctx,
 extern "C" {

 

 /**

- * Called via ctx->Driver.CompilerShader().

- * This is a no-op.

- * XXX can we remove the ctx->Driver.CompileShader() hook?

- */

-GLboolean

-_mesa_ir_compile_shader(struct gl_context *ctx, struct gl_shader *shader)

-{

-   assert(shader->CompileStatus);

-   (void) ctx;

-

-   return GL_TRUE;

-}

-

-

-/**

  * Link a shader.

  * Called via ctx->Driver.LinkShader()

  * This actually involves converting GLSL IR into Mesa gl_programs with

@@ -3293,11 +3278,6 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader)
    reparent_ir(shader->ir, shader->ir);

 

    ralloc_free(state);

-

-   if (shader->CompileStatus) {

-      if (!ctx->Driver.CompileShader(ctx, shader))

-	 shader->CompileStatus = GL_FALSE;

-   }

 }

 

 

diff --git a/mesalib/src/mesa/swrast/s_span.c b/mesalib/src/mesa/swrast/s_span.c
index 029c88b29..75e3c53a1 100644
--- a/mesalib/src/mesa/swrast/s_span.c
+++ b/mesalib/src/mesa/swrast/s_span.c
@@ -299,7 +299,8 @@ interpolate_int_colors(struct gl_context *ctx, SWspan *span)
       interpolate_active_attribs(ctx, span, FRAG_BIT_COL0);

       break;

    default:

-      _mesa_problem(NULL, "bad datatype in interpolate_int_colors");

+      _mesa_problem(ctx, "bad datatype 0x%x in interpolate_int_colors",

+                    span->array->ChanType);

    }

    span->arrayMask |= SPAN_RGBA;

 }