Synchronised line endinge with release branch

1 files changed, 1137 insertions, 1137 deletions

diff --git a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h b/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
index 1738a9e2b..65717eb45 100644
--- a/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/mesalib/src/mesa/vbo/vbo_attrib_tmp.h
@@ -1,1137 +1,1137 @@
-/**************************************************************************

-

-Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.

-Copyright 2011 Dave Airlie (ARB_vertex_type_2_10_10_10_rev support)

-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

-on the rights to use, copy, modify, merge, publish, distribute, sub

-license, 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 (including the next

-paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL

-TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS 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.

-

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

-

-/* float */

-#define ATTR1FV( A, V ) ATTR( A, 1, (V)[0], 0, 0, 1 )

-#define ATTR2FV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )

-#define ATTR3FV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )

-#define ATTR4FV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )

-

-#define ATTR1F( A, X )          ATTR( A, 1, X, 0, 0, 1 )

-#define ATTR2F( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )

-#define ATTR3F( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )

-#define ATTR4F( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )

-

-/* int */

-#define ATTR2IV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )

-#define ATTR3IV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )

-#define ATTR4IV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )

-

-#define ATTR1I( A, X )          ATTR( A, 1, X, 0, 0, 1 )

-#define ATTR2I( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )

-#define ATTR3I( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )

-#define ATTR4I( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )

-

-

-/* uint */

-#define ATTR2UIV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )

-#define ATTR3UIV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )

-#define ATTR4UIV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )

-

-#define ATTR1UI( A, X )          ATTR( A, 1, X, 0, 0, 1 )

-#define ATTR2UI( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )

-#define ATTR3UI( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )

-#define ATTR4UI( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )

-

-#define MAT_ATTR( A, N, V ) ATTR( A, N, (V)[0], (V)[1], (V)[2], (V)[3] )

-

-static INLINE float conv_ui10_to_norm_float(unsigned ui10)

-{

-   return (float)(ui10) / 1023.0;

-}

-

-static INLINE float conv_ui2_to_norm_float(unsigned ui2)

-{

-   return (float)(ui2) / 3.0;

-}

-

-#define ATTRUI10_1( A, UI ) ATTR( A, 1, (UI) & 0x3ff, 0, 0, 1 )

-#define ATTRUI10_2( A, UI ) ATTR( A, 2, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, 0, 1 )

-#define ATTRUI10_3( A, UI ) ATTR( A, 3, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, 1 )

-#define ATTRUI10_4( A, UI ) ATTR( A, 4, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, ((UI) >> 30) & 0x3 )

-

-#define ATTRUI10N_1( A, UI ) ATTR( A, 1, conv_ui10_to_norm_float((UI) & 0x3ff), 0, 0, 1 )

-#define ATTRUI10N_2( A, UI ) ATTR( A, 2, \

-				   conv_ui10_to_norm_float((UI) & 0x3ff), \

-				   conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), 0, 1 )

-#define ATTRUI10N_3( A, UI ) ATTR( A, 3, \

-				   conv_ui10_to_norm_float((UI) & 0x3ff), \

-				   conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), \

-				   conv_ui10_to_norm_float(((UI) >> 20) & 0x3ff), 1 )

-#define ATTRUI10N_4( A, UI ) ATTR( A, 4, \

-				   conv_ui10_to_norm_float((UI) & 0x3ff), \

-				   conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), \

-				   conv_ui10_to_norm_float(((UI) >> 20) & 0x3ff), \

-				   conv_ui2_to_norm_float(((UI) >> 30) & 0x3) )

-

-struct attr_bits_10 {signed int x:10;};

-struct attr_bits_2 {signed int x:2;};

-

-static INLINE float conv_i10_to_i(int i10)

-{

-   struct attr_bits_10 val;

-   val.x = i10;

-   return (float)val.x;

-}

-

-static INLINE float conv_i2_to_i(int i2)

-{

-   struct attr_bits_2 val;

-   val.x = i2;

-   return (float)val.x;

-}

-

-static INLINE float conv_i10_to_norm_float(int i10)

-{

-   struct attr_bits_10 val;

-   val.x = i10;

-   return (2.0F * (float)val.x + 1.0F) * (1.0F  / 511.0F);

-}

-

-static INLINE float conv_i2_to_norm_float(int i2)

-{

-   struct attr_bits_2 val;

-   val.x = i2;

-   return (float)val.x;

-}

-

-#define ATTRI10_1( A, I10 ) ATTR( A, 1, conv_i10_to_i((I10) & 0x3ff), 0, 0, 1 )

-#define ATTRI10_2( A, I10 ) ATTR( A, 2, \

-				conv_i10_to_i((I10) & 0x3ff),		\

-				conv_i10_to_i(((I10) >> 10) & 0x3ff), 0, 1 )

-#define ATTRI10_3( A, I10 ) ATTR( A, 3, \

-				conv_i10_to_i((I10) & 0x3ff),	    \

-				conv_i10_to_i(((I10) >> 10) & 0x3ff), \

-				conv_i10_to_i(((I10) >> 20) & 0x3ff), 1 )

-#define ATTRI10_4( A, I10 ) ATTR( A, 4, \

-				conv_i10_to_i((I10) & 0x3ff),		\

-				conv_i10_to_i(((I10) >> 10) & 0x3ff), \

-				conv_i10_to_i(((I10) >> 20) & 0x3ff), \

-				conv_i2_to_i(((I10) >> 30) & 0x3))

-

-

-#define ATTRI10N_1( A, I10 ) ATTR( A, 1, conv_i10_to_norm_float((I10) & 0x3ff), 0, 0, 1 )

-#define ATTRI10N_2( A, I10 ) ATTR( A, 2, \

-				conv_i10_to_norm_float((I10) & 0x3ff),		\

-				conv_i10_to_norm_float(((I10) >> 10) & 0x3ff), 0, 1 )

-#define ATTRI10N_3( A, I10 ) ATTR( A, 3, \

-				conv_i10_to_norm_float((I10) & 0x3ff),	    \

-				conv_i10_to_norm_float(((I10) >> 10) & 0x3ff), \

-				conv_i10_to_norm_float(((I10) >> 20) & 0x3ff), 1 )

-#define ATTRI10N_4( A, I10 ) ATTR( A, 4, \

-				conv_i10_to_norm_float((I10) & 0x3ff),		\

-				conv_i10_to_norm_float(((I10) >> 10) & 0x3ff), \

-				conv_i10_to_norm_float(((I10) >> 20) & 0x3ff), \

-				conv_i2_to_norm_float(((I10) >> 30) & 0x3))

-

-#define ATTR_UI(val, type, normalized, attr, arg) do {		\

-   if ((type) == GL_UNSIGNED_INT_2_10_10_10_REV) {		\

-      if (normalized) {						\

-	 ATTRUI10N_##val((attr), (arg));			\

-      } else {							\

-	 ATTRUI10_##val((attr), (arg));				\

-      }								\

-   }   else if ((type) == GL_INT_2_10_10_10_REV) {		\

-      if (normalized) {						\

-	 ATTRI10N_##val((attr), (arg));				\

-      } else {							\

-	 ATTRI10_##val((attr), (arg));				\

-      }								\

-   } else							\

-      ERROR(GL_INVALID_VALUE);					\

-   } while(0)

-

-#define ATTR_UI_INDEX(val, type, normalized, index, arg) do {	\

-      if ((index) == 0) {					\

-	 ATTR_UI(val, (type), normalized, 0, (arg));			\

-      } else if ((index) < MAX_VERTEX_GENERIC_ATTRIBS) {		\

-	 ATTR_UI(val, (type), normalized, VBO_ATTRIB_GENERIC0 + (index), (arg)); \

-      } else								\

-	 ERROR(GL_INVALID_VALUE);					\

-   } while(0)

-

-static void GLAPIENTRY

-TAG(Vertex2f)(GLfloat x, GLfloat y)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR2F(VBO_ATTRIB_POS, x, y);

-}

-

-static void GLAPIENTRY

-TAG(Vertex2fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR2FV(VBO_ATTRIB_POS, v);

-}

-

-static void GLAPIENTRY

-TAG(Vertex3f)(GLfloat x, GLfloat y, GLfloat z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3F(VBO_ATTRIB_POS, x, y, z);

-}

-

-static void GLAPIENTRY

-TAG(Vertex3fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3FV(VBO_ATTRIB_POS, v);

-}

-

-static void GLAPIENTRY

-TAG(Vertex4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR4F(VBO_ATTRIB_POS, x, y, z, w);

-}

-

-static void GLAPIENTRY

-TAG(Vertex4fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR4FV(VBO_ATTRIB_POS, v);

-}

-

-

-

-static void GLAPIENTRY

-TAG(TexCoord1f)(GLfloat x)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR1F(VBO_ATTRIB_TEX0, x);

-}

-

-static void GLAPIENTRY

-TAG(TexCoord1fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR1FV(VBO_ATTRIB_TEX0, v);

-}

-

-static void GLAPIENTRY

-TAG(TexCoord2f)(GLfloat x, GLfloat y)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR2F(VBO_ATTRIB_TEX0, x, y);

-}

-

-static void GLAPIENTRY

-TAG(TexCoord2fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR2FV(VBO_ATTRIB_TEX0, v);

-}

-

-static void GLAPIENTRY

-TAG(TexCoord3f)(GLfloat x, GLfloat y, GLfloat z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3F(VBO_ATTRIB_TEX0, x, y, z);

-}

-

-static void GLAPIENTRY

-TAG(TexCoord3fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3FV(VBO_ATTRIB_TEX0, v);

-}

-

-static void GLAPIENTRY

-TAG(TexCoord4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR4F(VBO_ATTRIB_TEX0, x, y, z, w);

-}

-

-static void GLAPIENTRY

-TAG(TexCoord4fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR4FV(VBO_ATTRIB_TEX0, v);

-}

-

-

-

-static void GLAPIENTRY

-TAG(Normal3f)(GLfloat x, GLfloat y, GLfloat z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3F(VBO_ATTRIB_NORMAL, x, y, z);

-}

-

-static void GLAPIENTRY

-TAG(Normal3fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3FV(VBO_ATTRIB_NORMAL, v);

-}

-

-

-

-static void GLAPIENTRY

-TAG(FogCoordfEXT)(GLfloat x)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR1F(VBO_ATTRIB_FOG, x);

-}

-

-

-

-static void GLAPIENTRY

-TAG(FogCoordfvEXT)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR1FV(VBO_ATTRIB_FOG, v);

-}

-

-static void GLAPIENTRY

-TAG(Color3f)(GLfloat x, GLfloat y, GLfloat z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3F(VBO_ATTRIB_COLOR0, x, y, z);

-}

-

-static void GLAPIENTRY

-TAG(Color3fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3FV(VBO_ATTRIB_COLOR0, v);

-}

-

-static void GLAPIENTRY

-TAG(Color4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR4F(VBO_ATTRIB_COLOR0, x, y, z, w);

-}

-

-static void GLAPIENTRY

-TAG(Color4fv)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR4FV(VBO_ATTRIB_COLOR0, v);

-}

-

-

-

-static void GLAPIENTRY

-TAG(SecondaryColor3fEXT)(GLfloat x, GLfloat y, GLfloat z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3F(VBO_ATTRIB_COLOR1, x, y, z);

-}

-

-static void GLAPIENTRY

-TAG(SecondaryColor3fvEXT)(const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR3FV(VBO_ATTRIB_COLOR1, v);

-}

-

-

-

-static void GLAPIENTRY

-TAG(EdgeFlag)(GLboolean b)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR1F(VBO_ATTRIB_EDGEFLAG, (GLfloat) b);

-}

-

-

-

-static void GLAPIENTRY

-TAG(Indexf)(GLfloat f)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR1F(VBO_ATTRIB_INDEX, f);

-}

-

-static void GLAPIENTRY

-TAG(Indexfv)(const GLfloat * f)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR1FV(VBO_ATTRIB_INDEX, f);

-}

-

-

-

-static void GLAPIENTRY

-TAG(MultiTexCoord1f)(GLenum target, GLfloat x)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR1F(attr, x);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoord1fv)(GLenum target, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR1FV(attr, v);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoord2f)(GLenum target, GLfloat x, GLfloat y)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR2F(attr, x, y);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoord2fv)(GLenum target, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR2FV(attr, v);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoord3f)(GLenum target, GLfloat x, GLfloat y, GLfloat z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR3F(attr, x, y, z);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoord3fv)(GLenum target, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR3FV(attr, v);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoord4f)(GLenum target, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR4F(attr, x, y, z, w);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoord4fv)(GLenum target, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR4FV(attr, v);

-}

-

-

-

-static void GLAPIENTRY

-TAG(VertexAttrib1fARB)(GLuint index, GLfloat x)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR1F(0, x);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR1F(VBO_ATTRIB_GENERIC0 + index, x);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib1fvARB)(GLuint index, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR1FV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR1FV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR2F(0, x, y);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR2F(VBO_ATTRIB_GENERIC0 + index, x, y);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib2fvARB)(GLuint index, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR2FV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR2FV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR3F(0, x, y, z);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR3F(VBO_ATTRIB_GENERIC0 + index, x, y, z);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib3fvARB)(GLuint index, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR3FV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR3FV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR4F(0, x, y, z, w);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR4F(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib4fvARB)(GLuint index, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR4FV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR4FV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-

-

-/* Integer-valued generic attributes.

- * XXX: the integers just get converted to floats at this time

- */

-static void GLAPIENTRY

-TAG(VertexAttribI1i)(GLuint index, GLint x)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR1I(0, x);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR1I(VBO_ATTRIB_GENERIC0 + index, x);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI2i)(GLuint index, GLint x, GLint y)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR2I(0, x, y);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR2I(VBO_ATTRIB_GENERIC0 + index, x, y);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI3i)(GLuint index, GLint x, GLint y, GLint z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR3I(0, x, y, z);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR3I(VBO_ATTRIB_GENERIC0 + index, x, y, z);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR4I(0, x, y, z, w);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR4I(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI2iv)(GLuint index, const GLint *v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR2IV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR2IV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI3iv)(GLuint index, const GLint *v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR3IV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR3IV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI4iv)(GLuint index, const GLint *v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR4IV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR4IV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-

-

-/* Unsigned integer-valued generic attributes.

- * XXX: the integers just get converted to floats at this time

- */

-static void GLAPIENTRY

-TAG(VertexAttribI1ui)(GLuint index, GLuint x)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR1UI(0, x);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR1UI(VBO_ATTRIB_GENERIC0 + index, x);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI2ui)(GLuint index, GLuint x, GLuint y)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR2UI(0, x, y);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR2UI(VBO_ATTRIB_GENERIC0 + index, x, y);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI3ui)(GLuint index, GLuint x, GLuint y, GLuint z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR3UI(0, x, y, z);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR3UI(VBO_ATTRIB_GENERIC0 + index, x, y, z);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR4UI(0, x, y, z, w);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR4UI(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI2uiv)(GLuint index, const GLuint *v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR2UIV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR2UIV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI3uiv)(GLuint index, const GLuint *v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR3UIV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR3UIV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribI4uiv)(GLuint index, const GLuint *v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index == 0)

-      ATTR4UIV(0, v);

-   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)

-      ATTR4UIV(VBO_ATTRIB_GENERIC0 + index, v);

-   else

-      ERROR(GL_INVALID_VALUE);

-}

-

-

-

-/* In addition to supporting NV_vertex_program, these entrypoints are

- * used by the display list and other code specifically because of

- * their property of aliasing with other attributes.  (See

- * vbo_save_loopback.c)

- */

-static void GLAPIENTRY

-TAG(VertexAttrib1fNV)(GLuint index, GLfloat x)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index < VBO_ATTRIB_MAX)

-      ATTR1F(index, x);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib1fvNV)(GLuint index, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index < VBO_ATTRIB_MAX)

-      ATTR1FV(index, v);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index < VBO_ATTRIB_MAX)

-      ATTR2F(index, x, y);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib2fvNV)(GLuint index, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index < VBO_ATTRIB_MAX)

-      ATTR2FV(index, v);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index < VBO_ATTRIB_MAX)

-      ATTR3F(index, x, y, z);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib3fvNV)(GLuint index,

- const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index < VBO_ATTRIB_MAX)

-      ATTR3FV(index, v);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index < VBO_ATTRIB_MAX)

-      ATTR4F(index, x, y, z, w);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttrib4fvNV)(GLuint index, const GLfloat * v)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   if (index < VBO_ATTRIB_MAX)

-      ATTR4FV(index, v);

-}

-

-

-

-#define MAT( ATTR, N, face, params )			\

-do {							\

-   if (face != GL_BACK)					\

-      MAT_ATTR( ATTR, N, params ); /* front */		\

-   if (face != GL_FRONT)				\

-      MAT_ATTR( ATTR + 1, N, params ); /* back */	\

-} while (0)

-

-

-/* Colormaterial conflicts are dealt with later.

- */

-static void GLAPIENTRY

-TAG(Materialfv)(GLenum face, GLenum pname,

-                 const GLfloat * params)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   switch (pname) {

-   case GL_EMISSION:

-      MAT(VBO_ATTRIB_MAT_FRONT_EMISSION, 4, face, params);

-      break;

-   case GL_AMBIENT:

-      MAT(VBO_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params);

-      break;

-   case GL_DIFFUSE:

-      MAT(VBO_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params);

-      break;

-   case GL_SPECULAR:

-      MAT(VBO_ATTRIB_MAT_FRONT_SPECULAR, 4, face, params);

-      break;

-   case GL_SHININESS:

-      MAT(VBO_ATTRIB_MAT_FRONT_SHININESS, 1, face, params);

-      break;

-   case GL_COLOR_INDEXES:

-      MAT(VBO_ATTRIB_MAT_FRONT_INDEXES, 3, face, params);

-      break;

-   case GL_AMBIENT_AND_DIFFUSE:

-      MAT(VBO_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params);

-      MAT(VBO_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params);

-      break;

-   default:

-      ERROR(GL_INVALID_ENUM);

-      return;

-   }

-}

-

-static void GLAPIENTRY

-TAG(VertexP2ui)(GLenum type, GLuint value)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(2, type, 0, VBO_ATTRIB_POS, value);

-}

-

-static void GLAPIENTRY

-TAG(VertexP2uiv)(GLenum type, const GLuint *value)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(2, type, 0, VBO_ATTRIB_POS, value[0]);

-}

-

-static void GLAPIENTRY

-TAG(VertexP3ui)(GLenum type, GLuint value)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(3, type, 0, VBO_ATTRIB_POS, value);

-}

-

-static void GLAPIENTRY

-TAG(VertexP3uiv)(GLenum type, const GLuint *value)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(3, type, 0, VBO_ATTRIB_POS, value[0]);

-}

-

-static void GLAPIENTRY

-TAG(VertexP4ui)(GLenum type, GLuint value)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(4, type, 0, VBO_ATTRIB_POS, value);

-}

-

-static void GLAPIENTRY

-TAG(VertexP4uiv)(GLenum type, const GLuint *value)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(4, type, 0, VBO_ATTRIB_POS, value[0]);

-}

-

-static void GLAPIENTRY

-TAG(TexCoordP1ui)(GLenum type, GLuint coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(1, type, 0, VBO_ATTRIB_TEX0, coords);

-}

-

-static void GLAPIENTRY

-TAG(TexCoordP1uiv)(GLenum type, const GLuint *coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(1, type, 0, VBO_ATTRIB_TEX0, coords[0]);

-}

-

-static void GLAPIENTRY

-TAG(TexCoordP2ui)(GLenum type, GLuint coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(2, type, 0, VBO_ATTRIB_TEX0, coords);

-}

-

-static void GLAPIENTRY

-TAG(TexCoordP2uiv)(GLenum type, const GLuint *coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(2, type, 0, VBO_ATTRIB_TEX0, coords[0]);

-}

-

-static void GLAPIENTRY

-TAG(TexCoordP3ui)(GLenum type, GLuint coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(3, type, 0, VBO_ATTRIB_TEX0, coords);

-}

-

-static void GLAPIENTRY

-TAG(TexCoordP3uiv)(GLenum type, const GLuint *coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(3, type, 0, VBO_ATTRIB_TEX0, coords[0]);

-}

-

-static void GLAPIENTRY

-TAG(TexCoordP4ui)(GLenum type, GLuint coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(4, type, 0, VBO_ATTRIB_TEX0, coords);

-}

-

-static void GLAPIENTRY

-TAG(TexCoordP4uiv)(GLenum type, const GLuint *coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(4, type, 0, VBO_ATTRIB_TEX0, coords[0]);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoordP1ui)(GLenum target, GLenum type, GLuint coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR_UI(1, type, 0, attr, coords);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoordP1uiv)(GLenum target, GLenum type, const GLuint *coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR_UI(1, type, 0, attr, coords[0]);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoordP2ui)(GLenum target, GLenum type, GLuint coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR_UI(2, type, 0, attr, coords);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoordP2uiv)(GLenum target, GLenum type, const GLuint *coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR_UI(2, type, 0, attr, coords[0]);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoordP3ui)(GLenum target, GLenum type, GLuint coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR_UI(3, type, 0, attr, coords);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoordP3uiv)(GLenum target, GLenum type, const GLuint *coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR_UI(3, type, 0, attr, coords[0]);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoordP4ui)(GLenum target, GLenum type, GLuint coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR_UI(4, type, 0, attr, coords);

-}

-

-static void GLAPIENTRY

-TAG(MultiTexCoordP4uiv)(GLenum target, GLenum type, const GLuint *coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;

-   ATTR_UI(4, type, 0, attr, coords[0]);

-}

-

-static void GLAPIENTRY

-TAG(NormalP3ui)(GLenum type, GLuint coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(3, type, 1, VBO_ATTRIB_NORMAL, coords);

-}

-

-static void GLAPIENTRY

-TAG(NormalP3uiv)(GLenum type, const GLuint *coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(3, type, 1, VBO_ATTRIB_NORMAL, coords[0]);

-}

-

-static void GLAPIENTRY

-TAG(ColorP3ui)(GLenum type, GLuint color)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(3, type, 1, VBO_ATTRIB_COLOR0, color);

-}

-

-static void GLAPIENTRY

-TAG(ColorP3uiv)(GLenum type, const GLuint *color)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(3, type, 1, VBO_ATTRIB_COLOR0, color[0]);

-}

-

-static void GLAPIENTRY

-TAG(ColorP4ui)(GLenum type, GLuint color)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(4, type, 1, VBO_ATTRIB_COLOR0, color);

-}

-

-static void GLAPIENTRY

-TAG(ColorP4uiv)(GLenum type, const GLuint *color)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(4, type, 1, VBO_ATTRIB_COLOR0, color[0]);

-}

-

-static void GLAPIENTRY

-TAG(SecondaryColorP3ui)(GLenum type, GLuint color)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(3, type, 1, VBO_ATTRIB_COLOR1, color);

-}

-

-static void GLAPIENTRY

-TAG(SecondaryColorP3uiv)(GLenum type, const GLuint *color)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI(3, type, 1, VBO_ATTRIB_COLOR1, color[0]);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribP1ui)(GLuint index, GLenum type, GLboolean normalized,

-		      GLuint value)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI_INDEX(1, type, normalized, index, value);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribP2ui)(GLuint index, GLenum type, GLboolean normalized,

-		      GLuint value)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI_INDEX(2, type, normalized, index, value);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribP3ui)(GLuint index, GLenum type, GLboolean normalized,

-		      GLuint value)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI_INDEX(3, type, normalized, index, value);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribP4ui)(GLuint index, GLenum type, GLboolean normalized,

-		      GLuint value)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI_INDEX(4, type, normalized, index, value);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribP1uiv)(GLuint index, GLenum type, GLboolean normalized,

-		       const GLuint *value)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI_INDEX(1, type, normalized, index, *value);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribP2uiv)(GLuint index, GLenum type, GLboolean normalized,

-		       const GLuint *value)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI_INDEX(2, type, normalized, index, *value);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribP3uiv)(GLuint index, GLenum type, GLboolean normalized,

-		       const GLuint *value)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI_INDEX(3, type, normalized, index, *value);

-}

-

-static void GLAPIENTRY

-TAG(VertexAttribP4uiv)(GLuint index, GLenum type, GLboolean normalized,

-		      const GLuint *value)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ATTR_UI_INDEX(4, type, normalized, index, *value);

-}

-

-

-#undef ATTR1FV

-#undef ATTR2FV

-#undef ATTR3FV

-#undef ATTR4FV

-

-#undef ATTR1F

-#undef ATTR2F

-#undef ATTR3F

-#undef ATTR4F

-

-#undef ATTR_UI

-

-#undef MAT

-#undef MAT_ATTR

+/**************************************************************************
+
+Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
+Copyright 2011 Dave Airlie (ARB_vertex_type_2_10_10_10_rev support)
+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
+on the rights to use, copy, modify, merge, publish, distribute, sub
+license, 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 (including the next
+paragraph) 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 NON-INFRINGEMENT. IN NO EVENT SHALL
+TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS 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.
+
+**************************************************************************/
+
+/* float */
+#define ATTR1FV( A, V ) ATTR( A, 1, (V)[0], 0, 0, 1 )
+#define ATTR2FV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )
+#define ATTR3FV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )
+#define ATTR4FV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )
+
+#define ATTR1F( A, X )          ATTR( A, 1, X, 0, 0, 1 )
+#define ATTR2F( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )
+#define ATTR3F( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )
+#define ATTR4F( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )
+
+/* int */
+#define ATTR2IV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )
+#define ATTR3IV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )
+#define ATTR4IV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )
+
+#define ATTR1I( A, X )          ATTR( A, 1, X, 0, 0, 1 )
+#define ATTR2I( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )
+#define ATTR3I( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )
+#define ATTR4I( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )
+
+
+/* uint */
+#define ATTR2UIV( A, V ) ATTR( A, 2, (V)[0], (V)[1], 0, 1 )
+#define ATTR3UIV( A, V ) ATTR( A, 3, (V)[0], (V)[1], (V)[2], 1 )
+#define ATTR4UIV( A, V ) ATTR( A, 4, (V)[0], (V)[1], (V)[2], (V)[3] )
+
+#define ATTR1UI( A, X )          ATTR( A, 1, X, 0, 0, 1 )
+#define ATTR2UI( A, X, Y )       ATTR( A, 2, X, Y, 0, 1 )
+#define ATTR3UI( A, X, Y, Z )    ATTR( A, 3, X, Y, Z, 1 )
+#define ATTR4UI( A, X, Y, Z, W ) ATTR( A, 4, X, Y, Z, W )
+
+#define MAT_ATTR( A, N, V ) ATTR( A, N, (V)[0], (V)[1], (V)[2], (V)[3] )
+
+static INLINE float conv_ui10_to_norm_float(unsigned ui10)
+{
+   return (float)(ui10) / 1023.0;
+}
+
+static INLINE float conv_ui2_to_norm_float(unsigned ui2)
+{
+   return (float)(ui2) / 3.0;
+}
+
+#define ATTRUI10_1( A, UI ) ATTR( A, 1, (UI) & 0x3ff, 0, 0, 1 )
+#define ATTRUI10_2( A, UI ) ATTR( A, 2, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, 0, 1 )
+#define ATTRUI10_3( A, UI ) ATTR( A, 3, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, 1 )
+#define ATTRUI10_4( A, UI ) ATTR( A, 4, (UI) & 0x3ff, ((UI) >> 10) & 0x3ff, ((UI) >> 20) & 0x3ff, ((UI) >> 30) & 0x3 )
+
+#define ATTRUI10N_1( A, UI ) ATTR( A, 1, conv_ui10_to_norm_float((UI) & 0x3ff), 0, 0, 1 )
+#define ATTRUI10N_2( A, UI ) ATTR( A, 2, \
+				   conv_ui10_to_norm_float((UI) & 0x3ff), \
+				   conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), 0, 1 )
+#define ATTRUI10N_3( A, UI ) ATTR( A, 3, \
+				   conv_ui10_to_norm_float((UI) & 0x3ff), \
+				   conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), \
+				   conv_ui10_to_norm_float(((UI) >> 20) & 0x3ff), 1 )
+#define ATTRUI10N_4( A, UI ) ATTR( A, 4, \
+				   conv_ui10_to_norm_float((UI) & 0x3ff), \
+				   conv_ui10_to_norm_float(((UI) >> 10) & 0x3ff), \
+				   conv_ui10_to_norm_float(((UI) >> 20) & 0x3ff), \
+				   conv_ui2_to_norm_float(((UI) >> 30) & 0x3) )
+
+struct attr_bits_10 {signed int x:10;};
+struct attr_bits_2 {signed int x:2;};
+
+static INLINE float conv_i10_to_i(int i10)
+{
+   struct attr_bits_10 val;
+   val.x = i10;
+   return (float)val.x;
+}
+
+static INLINE float conv_i2_to_i(int i2)
+{
+   struct attr_bits_2 val;
+   val.x = i2;
+   return (float)val.x;
+}
+
+static INLINE float conv_i10_to_norm_float(int i10)
+{
+   struct attr_bits_10 val;
+   val.x = i10;
+   return (2.0F * (float)val.x + 1.0F) * (1.0F  / 511.0F);
+}
+
+static INLINE float conv_i2_to_norm_float(int i2)
+{
+   struct attr_bits_2 val;
+   val.x = i2;
+   return (float)val.x;
+}
+
+#define ATTRI10_1( A, I10 ) ATTR( A, 1, conv_i10_to_i((I10) & 0x3ff), 0, 0, 1 )
+#define ATTRI10_2( A, I10 ) ATTR( A, 2, \
+				conv_i10_to_i((I10) & 0x3ff),		\
+				conv_i10_to_i(((I10) >> 10) & 0x3ff), 0, 1 )
+#define ATTRI10_3( A, I10 ) ATTR( A, 3, \
+				conv_i10_to_i((I10) & 0x3ff),	    \
+				conv_i10_to_i(((I10) >> 10) & 0x3ff), \
+				conv_i10_to_i(((I10) >> 20) & 0x3ff), 1 )
+#define ATTRI10_4( A, I10 ) ATTR( A, 4, \
+				conv_i10_to_i((I10) & 0x3ff),		\
+				conv_i10_to_i(((I10) >> 10) & 0x3ff), \
+				conv_i10_to_i(((I10) >> 20) & 0x3ff), \
+				conv_i2_to_i(((I10) >> 30) & 0x3))
+
+
+#define ATTRI10N_1( A, I10 ) ATTR( A, 1, conv_i10_to_norm_float((I10) & 0x3ff), 0, 0, 1 )
+#define ATTRI10N_2( A, I10 ) ATTR( A, 2, \
+				conv_i10_to_norm_float((I10) & 0x3ff),		\
+				conv_i10_to_norm_float(((I10) >> 10) & 0x3ff), 0, 1 )
+#define ATTRI10N_3( A, I10 ) ATTR( A, 3, \
+				conv_i10_to_norm_float((I10) & 0x3ff),	    \
+				conv_i10_to_norm_float(((I10) >> 10) & 0x3ff), \
+				conv_i10_to_norm_float(((I10) >> 20) & 0x3ff), 1 )
+#define ATTRI10N_4( A, I10 ) ATTR( A, 4, \
+				conv_i10_to_norm_float((I10) & 0x3ff),		\
+				conv_i10_to_norm_float(((I10) >> 10) & 0x3ff), \
+				conv_i10_to_norm_float(((I10) >> 20) & 0x3ff), \
+				conv_i2_to_norm_float(((I10) >> 30) & 0x3))
+
+#define ATTR_UI(val, type, normalized, attr, arg) do {		\
+   if ((type) == GL_UNSIGNED_INT_2_10_10_10_REV) {		\
+      if (normalized) {						\
+	 ATTRUI10N_##val((attr), (arg));			\
+      } else {							\
+	 ATTRUI10_##val((attr), (arg));				\
+      }								\
+   }   else if ((type) == GL_INT_2_10_10_10_REV) {		\
+      if (normalized) {						\
+	 ATTRI10N_##val((attr), (arg));				\
+      } else {							\
+	 ATTRI10_##val((attr), (arg));				\
+      }								\
+   } else							\
+      ERROR(GL_INVALID_VALUE);					\
+   } while(0)
+
+#define ATTR_UI_INDEX(val, type, normalized, index, arg) do {	\
+      if ((index) == 0) {					\
+	 ATTR_UI(val, (type), normalized, 0, (arg));			\
+      } else if ((index) < MAX_VERTEX_GENERIC_ATTRIBS) {		\
+	 ATTR_UI(val, (type), normalized, VBO_ATTRIB_GENERIC0 + (index), (arg)); \
+      } else								\
+	 ERROR(GL_INVALID_VALUE);					\
+   } while(0)
+
+static void GLAPIENTRY
+TAG(Vertex2f)(GLfloat x, GLfloat y)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR2F(VBO_ATTRIB_POS, x, y);
+}
+
+static void GLAPIENTRY
+TAG(Vertex2fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR2FV(VBO_ATTRIB_POS, v);
+}
+
+static void GLAPIENTRY
+TAG(Vertex3f)(GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3F(VBO_ATTRIB_POS, x, y, z);
+}
+
+static void GLAPIENTRY
+TAG(Vertex3fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3FV(VBO_ATTRIB_POS, v);
+}
+
+static void GLAPIENTRY
+TAG(Vertex4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4F(VBO_ATTRIB_POS, x, y, z, w);
+}
+
+static void GLAPIENTRY
+TAG(Vertex4fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4FV(VBO_ATTRIB_POS, v);
+}
+
+
+
+static void GLAPIENTRY
+TAG(TexCoord1f)(GLfloat x)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1F(VBO_ATTRIB_TEX0, x);
+}
+
+static void GLAPIENTRY
+TAG(TexCoord1fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1FV(VBO_ATTRIB_TEX0, v);
+}
+
+static void GLAPIENTRY
+TAG(TexCoord2f)(GLfloat x, GLfloat y)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR2F(VBO_ATTRIB_TEX0, x, y);
+}
+
+static void GLAPIENTRY
+TAG(TexCoord2fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR2FV(VBO_ATTRIB_TEX0, v);
+}
+
+static void GLAPIENTRY
+TAG(TexCoord3f)(GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3F(VBO_ATTRIB_TEX0, x, y, z);
+}
+
+static void GLAPIENTRY
+TAG(TexCoord3fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3FV(VBO_ATTRIB_TEX0, v);
+}
+
+static void GLAPIENTRY
+TAG(TexCoord4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4F(VBO_ATTRIB_TEX0, x, y, z, w);
+}
+
+static void GLAPIENTRY
+TAG(TexCoord4fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4FV(VBO_ATTRIB_TEX0, v);
+}
+
+
+
+static void GLAPIENTRY
+TAG(Normal3f)(GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3F(VBO_ATTRIB_NORMAL, x, y, z);
+}
+
+static void GLAPIENTRY
+TAG(Normal3fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3FV(VBO_ATTRIB_NORMAL, v);
+}
+
+
+
+static void GLAPIENTRY
+TAG(FogCoordfEXT)(GLfloat x)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1F(VBO_ATTRIB_FOG, x);
+}
+
+
+
+static void GLAPIENTRY
+TAG(FogCoordfvEXT)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1FV(VBO_ATTRIB_FOG, v);
+}
+
+static void GLAPIENTRY
+TAG(Color3f)(GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3F(VBO_ATTRIB_COLOR0, x, y, z);
+}
+
+static void GLAPIENTRY
+TAG(Color3fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3FV(VBO_ATTRIB_COLOR0, v);
+}
+
+static void GLAPIENTRY
+TAG(Color4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4F(VBO_ATTRIB_COLOR0, x, y, z, w);
+}
+
+static void GLAPIENTRY
+TAG(Color4fv)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4FV(VBO_ATTRIB_COLOR0, v);
+}
+
+
+
+static void GLAPIENTRY
+TAG(SecondaryColor3fEXT)(GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3F(VBO_ATTRIB_COLOR1, x, y, z);
+}
+
+static void GLAPIENTRY
+TAG(SecondaryColor3fvEXT)(const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3FV(VBO_ATTRIB_COLOR1, v);
+}
+
+
+
+static void GLAPIENTRY
+TAG(EdgeFlag)(GLboolean b)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1F(VBO_ATTRIB_EDGEFLAG, (GLfloat) b);
+}
+
+
+
+static void GLAPIENTRY
+TAG(Indexf)(GLfloat f)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1F(VBO_ATTRIB_INDEX, f);
+}
+
+static void GLAPIENTRY
+TAG(Indexfv)(const GLfloat * f)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1FV(VBO_ATTRIB_INDEX, f);
+}
+
+
+
+static void GLAPIENTRY
+TAG(MultiTexCoord1f)(GLenum target, GLfloat x)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR1F(attr, x);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoord1fv)(GLenum target, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR1FV(attr, v);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoord2f)(GLenum target, GLfloat x, GLfloat y)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR2F(attr, x, y);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoord2fv)(GLenum target, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR2FV(attr, v);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoord3f)(GLenum target, GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR3F(attr, x, y, z);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoord3fv)(GLenum target, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR3FV(attr, v);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoord4f)(GLenum target, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR4F(attr, x, y, z, w);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoord4fv)(GLenum target, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR4FV(attr, v);
+}
+
+
+
+static void GLAPIENTRY
+TAG(VertexAttrib1fARB)(GLuint index, GLfloat x)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR1F(0, x);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR1F(VBO_ATTRIB_GENERIC0 + index, x);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib1fvARB)(GLuint index, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR1FV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR1FV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR2F(0, x, y);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR2F(VBO_ATTRIB_GENERIC0 + index, x, y);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib2fvARB)(GLuint index, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR2FV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR2FV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR3F(0, x, y, z);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR3F(VBO_ATTRIB_GENERIC0 + index, x, y, z);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib3fvARB)(GLuint index, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR3FV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR3FV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR4F(0, x, y, z, w);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR4F(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib4fvARB)(GLuint index, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR4FV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR4FV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+
+
+/* Integer-valued generic attributes.
+ * XXX: the integers just get converted to floats at this time
+ */
+static void GLAPIENTRY
+TAG(VertexAttribI1i)(GLuint index, GLint x)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR1I(0, x);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR1I(VBO_ATTRIB_GENERIC0 + index, x);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI2i)(GLuint index, GLint x, GLint y)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR2I(0, x, y);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR2I(VBO_ATTRIB_GENERIC0 + index, x, y);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI3i)(GLuint index, GLint x, GLint y, GLint z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR3I(0, x, y, z);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR3I(VBO_ATTRIB_GENERIC0 + index, x, y, z);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR4I(0, x, y, z, w);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR4I(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI2iv)(GLuint index, const GLint *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR2IV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR2IV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI3iv)(GLuint index, const GLint *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR3IV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR3IV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI4iv)(GLuint index, const GLint *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR4IV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR4IV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+
+
+/* Unsigned integer-valued generic attributes.
+ * XXX: the integers just get converted to floats at this time
+ */
+static void GLAPIENTRY
+TAG(VertexAttribI1ui)(GLuint index, GLuint x)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR1UI(0, x);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR1UI(VBO_ATTRIB_GENERIC0 + index, x);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI2ui)(GLuint index, GLuint x, GLuint y)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR2UI(0, x, y);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR2UI(VBO_ATTRIB_GENERIC0 + index, x, y);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI3ui)(GLuint index, GLuint x, GLuint y, GLuint z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR3UI(0, x, y, z);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR3UI(VBO_ATTRIB_GENERIC0 + index, x, y, z);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR4UI(0, x, y, z, w);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR4UI(VBO_ATTRIB_GENERIC0 + index, x, y, z, w);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI2uiv)(GLuint index, const GLuint *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR2UIV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR2UIV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI3uiv)(GLuint index, const GLuint *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR3UIV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR3UIV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribI4uiv)(GLuint index, const GLuint *v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
+      ATTR4UIV(0, v);
+   else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
+      ATTR4UIV(VBO_ATTRIB_GENERIC0 + index, v);
+   else
+      ERROR(GL_INVALID_VALUE);
+}
+
+
+
+/* In addition to supporting NV_vertex_program, these entrypoints are
+ * used by the display list and other code specifically because of
+ * their property of aliasing with other attributes.  (See
+ * vbo_save_loopback.c)
+ */
+static void GLAPIENTRY
+TAG(VertexAttrib1fNV)(GLuint index, GLfloat x)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
+      ATTR1F(index, x);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib1fvNV)(GLuint index, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
+      ATTR1FV(index, v);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
+      ATTR2F(index, x, y);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib2fvNV)(GLuint index, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
+      ATTR2FV(index, v);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
+      ATTR3F(index, x, y, z);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib3fvNV)(GLuint index,
+ const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
+      ATTR3FV(index, v);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
+      ATTR4F(index, x, y, z, w);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttrib4fvNV)(GLuint index, const GLfloat * v)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
+      ATTR4FV(index, v);
+}
+
+
+
+#define MAT( ATTR, N, face, params )			\
+do {							\
+   if (face != GL_BACK)					\
+      MAT_ATTR( ATTR, N, params ); /* front */		\
+   if (face != GL_FRONT)				\
+      MAT_ATTR( ATTR + 1, N, params ); /* back */	\
+} while (0)
+
+
+/* Colormaterial conflicts are dealt with later.
+ */
+static void GLAPIENTRY
+TAG(Materialfv)(GLenum face, GLenum pname,
+                 const GLfloat * params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   switch (pname) {
+   case GL_EMISSION:
+      MAT(VBO_ATTRIB_MAT_FRONT_EMISSION, 4, face, params);
+      break;
+   case GL_AMBIENT:
+      MAT(VBO_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params);
+      break;
+   case GL_DIFFUSE:
+      MAT(VBO_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params);
+      break;
+   case GL_SPECULAR:
+      MAT(VBO_ATTRIB_MAT_FRONT_SPECULAR, 4, face, params);
+      break;
+   case GL_SHININESS:
+      MAT(VBO_ATTRIB_MAT_FRONT_SHININESS, 1, face, params);
+      break;
+   case GL_COLOR_INDEXES:
+      MAT(VBO_ATTRIB_MAT_FRONT_INDEXES, 3, face, params);
+      break;
+   case GL_AMBIENT_AND_DIFFUSE:
+      MAT(VBO_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params);
+      MAT(VBO_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params);
+      break;
+   default:
+      ERROR(GL_INVALID_ENUM);
+      return;
+   }
+}
+
+static void GLAPIENTRY
+TAG(VertexP2ui)(GLenum type, GLuint value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(2, type, 0, VBO_ATTRIB_POS, value);
+}
+
+static void GLAPIENTRY
+TAG(VertexP2uiv)(GLenum type, const GLuint *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(2, type, 0, VBO_ATTRIB_POS, value[0]);
+}
+
+static void GLAPIENTRY
+TAG(VertexP3ui)(GLenum type, GLuint value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(3, type, 0, VBO_ATTRIB_POS, value);
+}
+
+static void GLAPIENTRY
+TAG(VertexP3uiv)(GLenum type, const GLuint *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(3, type, 0, VBO_ATTRIB_POS, value[0]);
+}
+
+static void GLAPIENTRY
+TAG(VertexP4ui)(GLenum type, GLuint value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(4, type, 0, VBO_ATTRIB_POS, value);
+}
+
+static void GLAPIENTRY
+TAG(VertexP4uiv)(GLenum type, const GLuint *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(4, type, 0, VBO_ATTRIB_POS, value[0]);
+}
+
+static void GLAPIENTRY
+TAG(TexCoordP1ui)(GLenum type, GLuint coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(1, type, 0, VBO_ATTRIB_TEX0, coords);
+}
+
+static void GLAPIENTRY
+TAG(TexCoordP1uiv)(GLenum type, const GLuint *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(1, type, 0, VBO_ATTRIB_TEX0, coords[0]);
+}
+
+static void GLAPIENTRY
+TAG(TexCoordP2ui)(GLenum type, GLuint coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(2, type, 0, VBO_ATTRIB_TEX0, coords);
+}
+
+static void GLAPIENTRY
+TAG(TexCoordP2uiv)(GLenum type, const GLuint *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(2, type, 0, VBO_ATTRIB_TEX0, coords[0]);
+}
+
+static void GLAPIENTRY
+TAG(TexCoordP3ui)(GLenum type, GLuint coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(3, type, 0, VBO_ATTRIB_TEX0, coords);
+}
+
+static void GLAPIENTRY
+TAG(TexCoordP3uiv)(GLenum type, const GLuint *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(3, type, 0, VBO_ATTRIB_TEX0, coords[0]);
+}
+
+static void GLAPIENTRY
+TAG(TexCoordP4ui)(GLenum type, GLuint coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(4, type, 0, VBO_ATTRIB_TEX0, coords);
+}
+
+static void GLAPIENTRY
+TAG(TexCoordP4uiv)(GLenum type, const GLuint *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(4, type, 0, VBO_ATTRIB_TEX0, coords[0]);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoordP1ui)(GLenum target, GLenum type, GLuint coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR_UI(1, type, 0, attr, coords);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoordP1uiv)(GLenum target, GLenum type, const GLuint *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR_UI(1, type, 0, attr, coords[0]);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoordP2ui)(GLenum target, GLenum type, GLuint coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR_UI(2, type, 0, attr, coords);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoordP2uiv)(GLenum target, GLenum type, const GLuint *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR_UI(2, type, 0, attr, coords[0]);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoordP3ui)(GLenum target, GLenum type, GLuint coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR_UI(3, type, 0, attr, coords);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoordP3uiv)(GLenum target, GLenum type, const GLuint *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR_UI(3, type, 0, attr, coords[0]);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoordP4ui)(GLenum target, GLenum type, GLuint coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR_UI(4, type, 0, attr, coords);
+}
+
+static void GLAPIENTRY
+TAG(MultiTexCoordP4uiv)(GLenum target, GLenum type, const GLuint *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
+   ATTR_UI(4, type, 0, attr, coords[0]);
+}
+
+static void GLAPIENTRY
+TAG(NormalP3ui)(GLenum type, GLuint coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(3, type, 1, VBO_ATTRIB_NORMAL, coords);
+}
+
+static void GLAPIENTRY
+TAG(NormalP3uiv)(GLenum type, const GLuint *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(3, type, 1, VBO_ATTRIB_NORMAL, coords[0]);
+}
+
+static void GLAPIENTRY
+TAG(ColorP3ui)(GLenum type, GLuint color)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(3, type, 1, VBO_ATTRIB_COLOR0, color);
+}
+
+static void GLAPIENTRY
+TAG(ColorP3uiv)(GLenum type, const GLuint *color)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(3, type, 1, VBO_ATTRIB_COLOR0, color[0]);
+}
+
+static void GLAPIENTRY
+TAG(ColorP4ui)(GLenum type, GLuint color)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(4, type, 1, VBO_ATTRIB_COLOR0, color);
+}
+
+static void GLAPIENTRY
+TAG(ColorP4uiv)(GLenum type, const GLuint *color)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(4, type, 1, VBO_ATTRIB_COLOR0, color[0]);
+}
+
+static void GLAPIENTRY
+TAG(SecondaryColorP3ui)(GLenum type, GLuint color)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(3, type, 1, VBO_ATTRIB_COLOR1, color);
+}
+
+static void GLAPIENTRY
+TAG(SecondaryColorP3uiv)(GLenum type, const GLuint *color)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI(3, type, 1, VBO_ATTRIB_COLOR1, color[0]);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribP1ui)(GLuint index, GLenum type, GLboolean normalized,
+		      GLuint value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI_INDEX(1, type, normalized, index, value);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribP2ui)(GLuint index, GLenum type, GLboolean normalized,
+		      GLuint value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI_INDEX(2, type, normalized, index, value);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribP3ui)(GLuint index, GLenum type, GLboolean normalized,
+		      GLuint value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI_INDEX(3, type, normalized, index, value);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribP4ui)(GLuint index, GLenum type, GLboolean normalized,
+		      GLuint value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI_INDEX(4, type, normalized, index, value);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribP1uiv)(GLuint index, GLenum type, GLboolean normalized,
+		       const GLuint *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI_INDEX(1, type, normalized, index, *value);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribP2uiv)(GLuint index, GLenum type, GLboolean normalized,
+		       const GLuint *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI_INDEX(2, type, normalized, index, *value);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribP3uiv)(GLuint index, GLenum type, GLboolean normalized,
+		       const GLuint *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI_INDEX(3, type, normalized, index, *value);
+}
+
+static void GLAPIENTRY
+TAG(VertexAttribP4uiv)(GLuint index, GLenum type, GLboolean normalized,
+		      const GLuint *value)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR_UI_INDEX(4, type, normalized, index, *value);
+}
+
+
+#undef ATTR1FV
+#undef ATTR2FV
+#undef ATTR3FV
+#undef ATTR4FV
+
+#undef ATTR1F
+#undef ATTR2F
+#undef ATTR3F
+#undef ATTR4F
+
+#undef ATTR_UI
+
+#undef MAT
+#undef MAT_ATTR