Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/configs/linux-dri
	mesalib/src/gallium/auxiliary/util/u_math.h
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/glapi_mapi_tmp.h
	mesalib/src/mapi/glapi/glapi_sparc.S
	mesalib/src/mapi/glapi/glapi_x86-64.S
	mesalib/src/mapi/glapi/glapi_x86.S
	mesalib/src/mapi/glapi/glapitable.h
	mesalib/src/mapi/glapi/glapitemp.h
	mesalib/src/mapi/glapi/glprocs.h
	mesalib/src/mesa/drivers/dri/Makefile.template
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/remap_helper.h
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/state_tracker/st_format.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	xorg-server/configure.ac
	xorg-server/dix/main.c
	xorg-server/dix/window.c
	xorg-server/hw/xquartz/GL/indirect.c
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/darwin.c
	xorg-server/hw/xquartz/darwin.h
	xorg-server/hw/xquartz/mach-startup/Makefile.am
	xorg-server/hw/xquartz/pbproxy/app-main.m
	xorg-server/hw/xquartz/pbproxy/pbproxy.h
	xorg-server/hw/xquartz/pbproxy/x-selection.m
	xorg-server/hw/xquartz/xpr/xpr.h
	xorg-server/hw/xquartz/xpr/xprEvent.c
	xorg-server/hw/xquartz/xpr/xprScreen.c
	xorg-server/include/privates.h
	xorg-server/include/protocol-versions.h
	xorg-server/test/Makefile.am
	xorg-server/xfixes/cursor.c
	xorg-server/xfixes/xfixes.c
	xorg-server/xkeyboard-config/configure.in
	xorg-server/xkeyboard-config/rules/base.extras.xml.in
	xorg-server/xkeyboard-config/rules/base.xml.in
	xorg-server/xkeyboard-config/symbols/de
	xorg-server/xkeyboard-config/symbols/lk
	xorg-server/xkeyboard-config/symbols/ru

1 files changed, 455 insertions, 454 deletions

diff --git a/mesalib/src/mesa/main/api_validate.c b/mesalib/src/mesa/main/api_validate.c
index 5916af9f7..2981d4229 100644
--- a/mesalib/src/mesa/main/api_validate.c
+++ b/mesalib/src/mesa/main/api_validate.c
@@ -1,454 +1,455 @@
-/*

- * Mesa 3-D graphics library

- * Version:  7.1

- *

- * 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.

- */

-

-#include "glheader.h"

-#include "api_validate.h"

-#include "bufferobj.h"

-#include "context.h"

-#include "imports.h"

-#include "mfeatures.h"

-#include "mtypes.h"

-#include "vbo/vbo.h"

-

-

-/**

- * \return  number of bytes in array [count] of type.

- */

-static GLsizei

-index_bytes(GLenum type, GLsizei count)

-{

-   if (type == GL_UNSIGNED_INT) {

-      return count * sizeof(GLuint);

-   }

-   else if (type == GL_UNSIGNED_BYTE) {

-      return count * sizeof(GLubyte);

-   }

-   else {

-      ASSERT(type == GL_UNSIGNED_SHORT);

-      return count * sizeof(GLushort);

-   }

-}

-

-

-/**

- * Find the max index in the given element/index buffer

- */

-GLuint

-_mesa_max_buffer_index(struct gl_context *ctx, GLuint count, GLenum type,

-                       const void *indices,

-                       struct gl_buffer_object *elementBuf)

-{

-   const GLubyte *map = NULL;

-   GLuint max = 0;

-   GLuint i;

-

-   if (_mesa_is_bufferobj(elementBuf)) {

-      /* elements are in a user-defined buffer object.  need to map it */

-      map = ctx->Driver.MapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER,

-                                  GL_READ_ONLY, elementBuf);

-      /* Actual address is the sum of pointers */

-      indices = (const GLvoid *) ADD_POINTERS(map, (const GLubyte *) indices);

-   }

-

-   if (type == GL_UNSIGNED_INT) {

-      for (i = 0; i < count; i++)

-         if (((GLuint *) indices)[i] > max)

-            max = ((GLuint *) indices)[i];

-   }

-   else if (type == GL_UNSIGNED_SHORT) {

-      for (i = 0; i < count; i++)

-         if (((GLushort *) indices)[i] > max)

-            max = ((GLushort *) indices)[i];

-   }

-   else {

-      ASSERT(type == GL_UNSIGNED_BYTE);

-      for (i = 0; i < count; i++)

-         if (((GLubyte *) indices)[i] > max)

-            max = ((GLubyte *) indices)[i];

-   }

-

-   if (map) {

-      ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB, elementBuf);

-   }

-

-   return max;

-}

-

-

-/**

- * Check if OK to draw arrays/elements.

- */

-static GLboolean

-check_valid_to_render(struct gl_context *ctx, const char *function)

-{

-   if (!_mesa_valid_to_render(ctx, function)) {

-      return GL_FALSE;

-   }

-

-   switch (ctx->API) {

-#if FEATURE_es2_glsl

-   case API_OPENGLES2:

-      /* For ES2, we can draw if any vertex array is enabled (and we

-       * should always have a vertex program/shader). */

-      if (ctx->Array.ArrayObj->_Enabled == 0x0 || !ctx->VertexProgram._Current)

-	 return GL_FALSE;

-      break;

-#endif

-

-#if FEATURE_ES1

-   case API_OPENGLES:

-      /* For OpenGL ES, only draw if we have vertex positions

-       */

-      if (!ctx->Array.ArrayObj->Vertex.Enabled)

-	 return GL_FALSE;

-      break;

-#endif

-

-#if FEATURE_GL

-   case API_OPENGL:

-      {

-         const struct gl_shader_program *vsProg =

-            ctx->Shader.CurrentVertexProgram;

-         GLboolean haveVertexShader = (vsProg && vsProg->LinkStatus);

-         GLboolean haveVertexProgram = ctx->VertexProgram._Enabled;

-         if (haveVertexShader || haveVertexProgram) {

-            /* Draw regardless of whether or not we have any vertex arrays.

-             * (Ex: could draw a point using a constant vertex pos)

-             */

-            return GL_TRUE;

-         }

-         else {

-            /* Draw if we have vertex positions (GL_VERTEX_ARRAY or generic

-             * array [0]).

-             */

-            return (ctx->Array.ArrayObj->Vertex.Enabled ||

-                    ctx->Array.ArrayObj->VertexAttrib[0].Enabled);

-         }

-      }

-      break;

-#endif

-

-   default:

-      ASSERT_NO_FEATURE();

-   }

-

-   return GL_TRUE;

-}

-

-

-/**

- * Do bounds checking on array element indexes.  Check that the vertices

- * pointed to by the indices don't lie outside buffer object bounds.

- * \return GL_TRUE if OK, GL_FALSE if any indexed vertex goes is out of bounds

- */

-static GLboolean

-check_index_bounds(struct gl_context *ctx, GLsizei count, GLenum type,

-		   const GLvoid *indices, GLint basevertex)

-{

-   struct _mesa_prim prim;

-   struct _mesa_index_buffer ib;

-   GLuint min, max;

-

-   /* Only the X Server needs to do this -- otherwise, accessing outside

-    * array/BO bounds allows application termination.

-    */

-   if (!ctx->Const.CheckArrayBounds)

-      return GL_TRUE;

-

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

-   prim.count = count;

-

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

-   ib.type = type;

-   ib.ptr = indices;

-   ib.obj = ctx->Array.ElementArrayBufferObj;

-

-   vbo_get_minmax_index(ctx, &prim, &ib, &min, &max);

-

-   if ((int)(min + basevertex) < 0 ||

-       max + basevertex > ctx->Array.ArrayObj->_MaxElement) {

-      /* the max element is out of bounds of one or more enabled arrays */

-      _mesa_warning(ctx, "glDrawElements() index=%u is out of bounds (max=%u)",

-                    max, ctx->Array.ArrayObj->_MaxElement);

-      return GL_FALSE;

-   }

-

-   return GL_TRUE;

-}

-

-

-/**

- * Error checking for glDrawElements().  Includes parameter checking

- * and VBO bounds checking.

- * \return GL_TRUE if OK to render, GL_FALSE if error found

- */

-GLboolean

-_mesa_validate_DrawElements(struct gl_context *ctx,

-			    GLenum mode, GLsizei count, GLenum type,

-			    const GLvoid *indices, GLint basevertex)

-{

-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

-

-   if (count <= 0) {

-      if (count < 0)

-	 _mesa_error(ctx, GL_INVALID_VALUE, "glDrawElements(count)" );

-      return GL_FALSE;

-   }

-

-   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(mode)" );

-      return GL_FALSE;

-   }

-

-   if (type != GL_UNSIGNED_INT &&

-       type != GL_UNSIGNED_BYTE &&

-       type != GL_UNSIGNED_SHORT)

-   {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(type)" );

-      return GL_FALSE;

-   }

-

-   if (!check_valid_to_render(ctx, "glDrawElements"))

-      return GL_FALSE;

-

-   /* Vertex buffer object tests */

-   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {

-      /* use indices in the buffer object */

-      /* make sure count doesn't go outside buffer bounds */

-      if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {

-         _mesa_warning(ctx, "glDrawElements index out of buffer bounds");

-         return GL_FALSE;

-      }

-   }

-   else {

-      /* not using a VBO */

-      if (!indices)

-         return GL_FALSE;

-   }

-

-   if (!check_index_bounds(ctx, count, type, indices, basevertex))

-      return GL_FALSE;

-

-   return GL_TRUE;

-}

-

-

-/**

- * Error checking for glDrawRangeElements().  Includes parameter checking

- * and VBO bounds checking.

- * \return GL_TRUE if OK to render, GL_FALSE if error found

- */

-GLboolean

-_mesa_validate_DrawRangeElements(struct gl_context *ctx, GLenum mode,

-				 GLuint start, GLuint end,

-				 GLsizei count, GLenum type,

-				 const GLvoid *indices, GLint basevertex)

-{

-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

-

-   if (count <= 0) {

-      if (count < 0)

-	 _mesa_error(ctx, GL_INVALID_VALUE, "glDrawRangeElements(count)" );

-      return GL_FALSE;

-   }

-

-   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawRangeElements(mode)" );

-      return GL_FALSE;

-   }

-

-   if (end < start) {

-      _mesa_error(ctx, GL_INVALID_VALUE, "glDrawRangeElements(end<start)");

-      return GL_FALSE;

-   }

-

-   if (type != GL_UNSIGNED_INT &&

-       type != GL_UNSIGNED_BYTE &&

-       type != GL_UNSIGNED_SHORT) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawRangeElements(type)" );

-      return GL_FALSE;

-   }

-

-   if (!check_valid_to_render(ctx, "glDrawRangeElements"))

-      return GL_FALSE;

-

-   /* Vertex buffer object tests */

-   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {

-      /* use indices in the buffer object */

-      /* make sure count doesn't go outside buffer bounds */

-      if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {

-         _mesa_warning(ctx, "glDrawRangeElements index out of buffer bounds");

-         return GL_FALSE;

-      }

-   }

-   else {

-      /* not using a VBO */

-      if (!indices)

-         return GL_FALSE;

-   }

-

-   if (!check_index_bounds(ctx, count, type, indices, basevertex))

-      return GL_FALSE;

-

-   return GL_TRUE;

-}

-

-

-/**

- * Called from the tnl module to error check the function parameters and

- * verify that we really can draw something.

- * \return GL_TRUE if OK to render, GL_FALSE if error found

- */

-GLboolean

-_mesa_validate_DrawArrays(struct gl_context *ctx,

-			  GLenum mode, GLint start, GLsizei count)

-{

-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

-

-   if (count <= 0) {

-      if (count < 0)

-         _mesa_error(ctx, GL_INVALID_VALUE, "glDrawArrays(count)" );

-      return GL_FALSE;

-   }

-

-   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {

-      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawArrays(mode)" );

-      return GL_FALSE;

-   }

-

-   if (!check_valid_to_render(ctx, "glDrawArrays"))

-      return GL_FALSE;

-

-   if (ctx->Const.CheckArrayBounds) {

-      if (start + count > (GLint) ctx->Array.ArrayObj->_MaxElement)

-         return GL_FALSE;

-   }

-

-   return GL_TRUE;

-}

-

-

-GLboolean

-_mesa_validate_DrawArraysInstanced(struct gl_context *ctx, GLenum mode, GLint first,

-                                   GLsizei count, GLsizei numInstances)

-{

-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

-

-   if (count <= 0) {

-      if (count < 0)

-         _mesa_error(ctx, GL_INVALID_VALUE,

-                     "glDrawArraysInstanced(count=%d)", count);

-      return GL_FALSE;

-   }

-

-   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glDrawArraysInstanced(mode=0x%x)", mode);

-      return GL_FALSE;

-   }

-

-   if (numInstances <= 0) {

-      if (numInstances < 0)

-         _mesa_error(ctx, GL_INVALID_VALUE,

-                     "glDrawArraysInstanced(numInstances=%d)", numInstances);

-      return GL_FALSE;

-   }

-

-   if (!check_valid_to_render(ctx, "glDrawArraysInstanced(invalid to render)"))

-      return GL_FALSE;

-

-   if (ctx->CompileFlag) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glDrawArraysInstanced(display list");

-      return GL_FALSE;

-   }

-

-   if (ctx->Const.CheckArrayBounds) {

-      if (first + count > (GLint) ctx->Array.ArrayObj->_MaxElement)

-         return GL_FALSE;

-   }

-

-   return GL_TRUE;

-}

-

-

-GLboolean

-_mesa_validate_DrawElementsInstanced(struct gl_context *ctx,

-                                     GLenum mode, GLsizei count, GLenum type,

-                                     const GLvoid *indices, GLsizei numInstances)

-{

-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);

-

-   if (count <= 0) {

-      if (count < 0)

-	 _mesa_error(ctx, GL_INVALID_VALUE,

-                     "glDrawElementsInstanced(count=%d)", count);

-      return GL_FALSE;

-   }

-

-   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glDrawElementsInstanced(mode = 0x%x)", mode);

-      return GL_FALSE;

-   }

-

-   if (type != GL_UNSIGNED_INT &&

-       type != GL_UNSIGNED_BYTE &&

-       type != GL_UNSIGNED_SHORT) {

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glDrawElementsInstanced(type=0x%x)", type);

-      return GL_FALSE;

-   }

-

-   if (numInstances <= 0) {

-      if (numInstances < 0)

-         _mesa_error(ctx, GL_INVALID_VALUE,

-                     "glDrawElementsInstanced(numInstances=%d)", numInstances);

-      return GL_FALSE;

-   }

-

-   if (!check_valid_to_render(ctx, "glDrawElementsInstanced"))

-      return GL_FALSE;

-

-   /* Vertex buffer object tests */

-   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {

-      /* use indices in the buffer object */

-      /* make sure count doesn't go outside buffer bounds */

-      if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {

-         _mesa_warning(ctx,

-                       "glDrawElementsInstanced index out of buffer bounds");

-         return GL_FALSE;

-      }

-   }

-   else {

-      /* not using a VBO */

-      if (!indices)

-         return GL_FALSE;

-   }

-

-   if (!check_index_bounds(ctx, count, type, indices, 0))

-      return GL_FALSE;

-

-   return GL_TRUE;

-}

+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * 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.
+ */
+
+#include "glheader.h"
+#include "api_validate.h"
+#include "bufferobj.h"
+#include "context.h"
+#include "imports.h"
+#include "mfeatures.h"
+#include "mtypes.h"
+#include "vbo/vbo.h"
+
+
+/**
+ * \return  number of bytes in array [count] of type.
+ */
+static GLsizei
+index_bytes(GLenum type, GLsizei count)
+{
+   if (type == GL_UNSIGNED_INT) {
+      return count * sizeof(GLuint);
+   }
+   else if (type == GL_UNSIGNED_BYTE) {
+      return count * sizeof(GLubyte);
+   }
+   else {
+      ASSERT(type == GL_UNSIGNED_SHORT);
+      return count * sizeof(GLushort);
+   }
+}
+
+
+/**
+ * Find the max index in the given element/index buffer
+ */
+GLuint
+_mesa_max_buffer_index(struct gl_context *ctx, GLuint count, GLenum type,
+                       const void *indices,
+                       struct gl_buffer_object *elementBuf)
+{
+   const GLubyte *map = NULL;
+   GLuint max = 0;
+   GLuint i;
+
+   if (_mesa_is_bufferobj(elementBuf)) {
+      /* elements are in a user-defined buffer object.  need to map it */
+      map = ctx->Driver.MapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER,
+                                  GL_READ_ONLY, elementBuf);
+      /* Actual address is the sum of pointers */
+      indices = (const GLvoid *) ADD_POINTERS(map, (const GLubyte *) indices);
+   }
+
+   if (type == GL_UNSIGNED_INT) {
+      for (i = 0; i < count; i++)
+         if (((GLuint *) indices)[i] > max)
+            max = ((GLuint *) indices)[i];
+   }
+   else if (type == GL_UNSIGNED_SHORT) {
+      for (i = 0; i < count; i++)
+         if (((GLushort *) indices)[i] > max)
+            max = ((GLushort *) indices)[i];
+   }
+   else {
+      ASSERT(type == GL_UNSIGNED_BYTE);
+      for (i = 0; i < count; i++)
+         if (((GLubyte *) indices)[i] > max)
+            max = ((GLubyte *) indices)[i];
+   }
+
+   if (map) {
+      ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB, elementBuf);
+   }
+
+   return max;
+}
+
+
+/**
+ * Check if OK to draw arrays/elements.
+ */
+static GLboolean
+check_valid_to_render(struct gl_context *ctx, const char *function)
+{
+   if (!_mesa_valid_to_render(ctx, function)) {
+      return GL_FALSE;
+   }
+
+   switch (ctx->API) {
+#if FEATURE_es2_glsl
+   case API_OPENGLES2:
+      /* For ES2, we can draw if any vertex array is enabled (and we
+       * should always have a vertex program/shader). */
+      if (ctx->Array.ArrayObj->_Enabled == 0x0 || !ctx->VertexProgram._Current)
+	 return GL_FALSE;
+      break;
+#endif
+
+#if FEATURE_ES1
+   case API_OPENGLES:
+      /* For OpenGL ES, only draw if we have vertex positions
+       */
+      if (!ctx->Array.ArrayObj->Vertex.Enabled)
+	 return GL_FALSE;
+      break;
+#endif
+
+#if FEATURE_GL
+   case API_OPENGL:
+      {
+         const struct gl_shader_program *vsProg =
+            ctx->Shader.CurrentVertexProgram;
+         GLboolean haveVertexShader = (vsProg && vsProg->LinkStatus);
+         GLboolean haveVertexProgram = ctx->VertexProgram._Enabled;
+         if (haveVertexShader || haveVertexProgram) {
+            /* Draw regardless of whether or not we have any vertex arrays.
+             * (Ex: could draw a point using a constant vertex pos)
+             */
+            return GL_TRUE;
+         }
+         else {
+            /* Draw if we have vertex positions (GL_VERTEX_ARRAY or generic
+             * array [0]).
+             */
+            return (ctx->Array.ArrayObj->Vertex.Enabled ||
+                    ctx->Array.ArrayObj->VertexAttrib[0].Enabled);
+         }
+      }
+      break;
+#endif
+
+   default:
+      ASSERT_NO_FEATURE();
+   }
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Do bounds checking on array element indexes.  Check that the vertices
+ * pointed to by the indices don't lie outside buffer object bounds.
+ * \return GL_TRUE if OK, GL_FALSE if any indexed vertex goes is out of bounds
+ */
+static GLboolean
+check_index_bounds(struct gl_context *ctx, GLsizei count, GLenum type,
+		   const GLvoid *indices, GLint basevertex)
+{
+   struct _mesa_prim prim;
+   struct _mesa_index_buffer ib;
+   GLuint min, max;
+
+   /* Only the X Server needs to do this -- otherwise, accessing outside
+    * array/BO bounds allows application termination.
+    */
+   if (!ctx->Const.CheckArrayBounds)
+      return GL_TRUE;
+
+   memset(&prim, 0, sizeof(prim));
+   prim.count = count;
+
+   memset(&ib, 0, sizeof(ib));
+   ib.type = type;
+   ib.ptr = indices;
+   ib.obj = ctx->Array.ElementArrayBufferObj;
+
+   vbo_get_minmax_index(ctx, &prim, &ib, &min, &max);
+
+   if ((int)(min + basevertex) < 0 ||
+       max + basevertex > ctx->Array.ArrayObj->_MaxElement) {
+      /* the max element is out of bounds of one or more enabled arrays */
+      _mesa_warning(ctx, "glDrawElements() index=%u is out of bounds (max=%u)",
+                    max, ctx->Array.ArrayObj->_MaxElement);
+      return GL_FALSE;
+   }
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Error checking for glDrawElements().  Includes parameter checking
+ * and VBO bounds checking.
+ * \return GL_TRUE if OK to render, GL_FALSE if error found
+ */
+GLboolean
+_mesa_validate_DrawElements(struct gl_context *ctx,
+			    GLenum mode, GLsizei count, GLenum type,
+			    const GLvoid *indices, GLint basevertex)
+{
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (count <= 0) {
+      if (count < 0)
+	 _mesa_error(ctx, GL_INVALID_VALUE, "glDrawElements(count)" );
+      return GL_FALSE;
+   }
+
+   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(mode)" );
+      return GL_FALSE;
+   }
+
+   if (type != GL_UNSIGNED_INT &&
+       type != GL_UNSIGNED_BYTE &&
+       type != GL_UNSIGNED_SHORT)
+   {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(type)" );
+      return GL_FALSE;
+   }
+
+   if (!check_valid_to_render(ctx, "glDrawElements"))
+      return GL_FALSE;
+
+   /* Vertex buffer object tests */
+   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {
+      /* use indices in the buffer object */
+      /* make sure count doesn't go outside buffer bounds */
+      if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {
+         _mesa_warning(ctx, "glDrawElements index out of buffer bounds");
+         return GL_FALSE;
+      }
+   }
+   else {
+      /* not using a VBO */
+      if (!indices)
+         return GL_FALSE;
+   }
+
+   if (!check_index_bounds(ctx, count, type, indices, basevertex))
+      return GL_FALSE;
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Error checking for glDrawRangeElements().  Includes parameter checking
+ * and VBO bounds checking.
+ * \return GL_TRUE if OK to render, GL_FALSE if error found
+ */
+GLboolean
+_mesa_validate_DrawRangeElements(struct gl_context *ctx, GLenum mode,
+				 GLuint start, GLuint end,
+				 GLsizei count, GLenum type,
+				 const GLvoid *indices, GLint basevertex)
+{
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (count <= 0) {
+      if (count < 0)
+	 _mesa_error(ctx, GL_INVALID_VALUE, "glDrawRangeElements(count)" );
+      return GL_FALSE;
+   }
+
+   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawRangeElements(mode)" );
+      return GL_FALSE;
+   }
+
+   if (end < start) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDrawRangeElements(end<start)");
+      return GL_FALSE;
+   }
+
+   if (type != GL_UNSIGNED_INT &&
+       type != GL_UNSIGNED_BYTE &&
+       type != GL_UNSIGNED_SHORT) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawRangeElements(type)" );
+      return GL_FALSE;
+   }
+
+   if (!check_valid_to_render(ctx, "glDrawRangeElements"))
+      return GL_FALSE;
+
+   /* Vertex buffer object tests */
+   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {
+      /* use indices in the buffer object */
+      /* make sure count doesn't go outside buffer bounds */
+      if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {
+         _mesa_warning(ctx, "glDrawRangeElements index out of buffer bounds");
+         return GL_FALSE;
+      }
+   }
+   else {
+      /* not using a VBO */
+      if (!indices)
+         return GL_FALSE;
+   }
+
+   if (!check_index_bounds(ctx, count, type, indices, basevertex))
+      return GL_FALSE;
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Called from the tnl module to error check the function parameters and
+ * verify that we really can draw something.
+ * \return GL_TRUE if OK to render, GL_FALSE if error found
+ */
+GLboolean
+_mesa_validate_DrawArrays(struct gl_context *ctx,
+			  GLenum mode, GLint start, GLsizei count)
+{
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (count <= 0) {
+      if (count < 0)
+         _mesa_error(ctx, GL_INVALID_VALUE, "glDrawArrays(count)" );
+      return GL_FALSE;
+   }
+
+   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawArrays(mode)" );
+      return GL_FALSE;
+   }
+
+   if (!check_valid_to_render(ctx, "glDrawArrays"))
+      return GL_FALSE;
+
+   if (ctx->Const.CheckArrayBounds) {
+      if (start + count > (GLint) ctx->Array.ArrayObj->_MaxElement)
+         return GL_FALSE;
+   }
+
+   return GL_TRUE;
+}
+
+
+GLboolean
+_mesa_validate_DrawArraysInstanced(struct gl_context *ctx, GLenum mode, GLint first,
+                                   GLsizei count, GLsizei numInstances)
+{
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (count <= 0) {
+      if (count < 0)
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glDrawArraysInstanced(count=%d)", count);
+      return GL_FALSE;
+   }
+
+   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glDrawArraysInstanced(mode=0x%x)", mode);
+      return GL_FALSE;
+   }
+
+   if (numInstances <= 0) {
+      if (numInstances < 0)
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glDrawArraysInstanced(numInstances=%d)", numInstances);
+      return GL_FALSE;
+   }
+
+   if (!check_valid_to_render(ctx, "glDrawArraysInstanced(invalid to render)"))
+      return GL_FALSE;
+
+   if (ctx->CompileFlag) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glDrawArraysInstanced(display list");
+      return GL_FALSE;
+   }
+
+   if (ctx->Const.CheckArrayBounds) {
+      if (first + count > (GLint) ctx->Array.ArrayObj->_MaxElement)
+         return GL_FALSE;
+   }
+
+   return GL_TRUE;
+}
+
+
+GLboolean
+_mesa_validate_DrawElementsInstanced(struct gl_context *ctx,
+                                     GLenum mode, GLsizei count, GLenum type,
+                                     const GLvoid *indices, GLsizei numInstances,
+                                     GLint basevertex)
+{
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+   if (count <= 0) {
+      if (count < 0)
+	 _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glDrawElementsInstanced(count=%d)", count);
+      return GL_FALSE;
+   }
+
+   if (mode > GL_TRIANGLE_STRIP_ADJACENCY_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glDrawElementsInstanced(mode = 0x%x)", mode);
+      return GL_FALSE;
+   }
+
+   if (type != GL_UNSIGNED_INT &&
+       type != GL_UNSIGNED_BYTE &&
+       type != GL_UNSIGNED_SHORT) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glDrawElementsInstanced(type=0x%x)", type);
+      return GL_FALSE;
+   }
+
+   if (numInstances <= 0) {
+      if (numInstances < 0)
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glDrawElementsInstanced(numInstances=%d)", numInstances);
+      return GL_FALSE;
+   }
+
+   if (!check_valid_to_render(ctx, "glDrawElementsInstanced"))
+      return GL_FALSE;
+
+   /* Vertex buffer object tests */
+   if (_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj)) {
+      /* use indices in the buffer object */
+      /* make sure count doesn't go outside buffer bounds */
+      if (index_bytes(type, count) > ctx->Array.ElementArrayBufferObj->Size) {
+         _mesa_warning(ctx,
+                       "glDrawElementsInstanced index out of buffer bounds");
+         return GL_FALSE;
+      }
+   }
+   else {
+      /* not using a VBO */
+      if (!indices)
+         return GL_FALSE;
+   }
+
+   if (!check_index_bounds(ctx, count, type, indices, basevertex))
+      return GL_FALSE;
+
+   return GL_TRUE;
+}