vbo: re-indent file

1 files changed, 234 insertions, 181 deletions

diff --git a/src/mesa/vbo/vbo_attrib_tmp.h b/src/mesa/vbo/vbo_attrib_tmp.h
index 7a889b8e2f..e680631383 100644
--- a/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/src/mesa/vbo/vbo_attrib_tmp.h
@@ -37,233 +37,284 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define MAT_ATTR( A, N, V ) ATTR( A, N, (V)[0], (V)[1], (V)[2], (V)[3] )
 
-static void GLAPIENTRY TAG(Vertex2f)( GLfloat x, GLfloat y )
+
+
+static void GLAPIENTRY
+TAG(Vertex2f)(GLfloat x, GLfloat y)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR2F( VBO_ATTRIB_POS, x, y );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR2F(VBO_ATTRIB_POS, x, y);
 }
 
-static void GLAPIENTRY TAG(Vertex2fv)( const GLfloat *v )
+static void GLAPIENTRY
+TAG(Vertex2fv)(const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR2FV( VBO_ATTRIB_POS, v );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR2FV(VBO_ATTRIB_POS, v);
 }
 
-static void GLAPIENTRY TAG(Vertex3f)( GLfloat x, GLfloat y, GLfloat z )
+static void GLAPIENTRY
+TAG(Vertex3f)(GLfloat x, GLfloat y, GLfloat z)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR3F( VBO_ATTRIB_POS, x, y, z );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3F(VBO_ATTRIB_POS, x, y, z);
 }
 
-static void GLAPIENTRY TAG(Vertex3fv)( const GLfloat *v )
+static void GLAPIENTRY
+TAG(Vertex3fv)(const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR3FV( VBO_ATTRIB_POS, v );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3FV(VBO_ATTRIB_POS, v);
 }
 
-static void GLAPIENTRY TAG(Vertex4f)( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+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 );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4F(VBO_ATTRIB_POS, x, y, z, w);
 }
 
-static void GLAPIENTRY TAG(Vertex4fv)( const GLfloat *v )
+static void GLAPIENTRY
+TAG(Vertex4fv)(const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR4FV( VBO_ATTRIB_POS, v );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4FV(VBO_ATTRIB_POS, v);
 }
 
-static void GLAPIENTRY TAG(TexCoord1f)( GLfloat x )
+
+
+static void GLAPIENTRY
+TAG(TexCoord1f)(GLfloat x)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR1F( VBO_ATTRIB_TEX0, x );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1F(VBO_ATTRIB_TEX0, x);
 }
 
-static void GLAPIENTRY TAG(TexCoord1fv)( const GLfloat *v )
+static void GLAPIENTRY
+TAG(TexCoord1fv)(const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR1FV( VBO_ATTRIB_TEX0, v );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1FV(VBO_ATTRIB_TEX0, v);
 }
 
-static void GLAPIENTRY TAG(TexCoord2f)( GLfloat x, GLfloat y )
+static void GLAPIENTRY
+TAG(TexCoord2f)(GLfloat x, GLfloat y)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR2F( VBO_ATTRIB_TEX0, x, y );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR2F(VBO_ATTRIB_TEX0, x, y);
 }
 
-static void GLAPIENTRY TAG(TexCoord2fv)( const GLfloat *v )
+static void GLAPIENTRY
+TAG(TexCoord2fv)(const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR2FV( VBO_ATTRIB_TEX0, v );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR2FV(VBO_ATTRIB_TEX0, v);
 }
 
-static void GLAPIENTRY TAG(TexCoord3f)( GLfloat x, GLfloat y, GLfloat z )
+static void GLAPIENTRY
+TAG(TexCoord3f)(GLfloat x, GLfloat y, GLfloat z)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR3F( VBO_ATTRIB_TEX0, x, y, z );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3F(VBO_ATTRIB_TEX0, x, y, z);
 }
 
-static void GLAPIENTRY TAG(TexCoord3fv)( const GLfloat *v )
+static void GLAPIENTRY
+TAG(TexCoord3fv)(const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR3FV( VBO_ATTRIB_TEX0, v );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3FV(VBO_ATTRIB_TEX0, v);
 }
 
-static void GLAPIENTRY TAG(TexCoord4f)( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+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 );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4F(VBO_ATTRIB_TEX0, x, y, z, w);
 }
 
-static void GLAPIENTRY TAG(TexCoord4fv)( const GLfloat *v )
+static void GLAPIENTRY
+TAG(TexCoord4fv)(const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR4FV( VBO_ATTRIB_TEX0, v );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4FV(VBO_ATTRIB_TEX0, v);
 }
 
-static void GLAPIENTRY TAG(Normal3f)( GLfloat x, GLfloat y, GLfloat z )
+
+
+static void GLAPIENTRY
+TAG(Normal3f)(GLfloat x, GLfloat y, GLfloat z)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR3F( VBO_ATTRIB_NORMAL, x, y, z );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3F(VBO_ATTRIB_NORMAL, x, y, z);
 }
 
-static void GLAPIENTRY TAG(Normal3fv)( const GLfloat *v )
+static void GLAPIENTRY
+TAG(Normal3fv)(const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR3FV( VBO_ATTRIB_NORMAL, v );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3FV(VBO_ATTRIB_NORMAL, v);
 }
 
-static void GLAPIENTRY TAG(FogCoordfEXT)( GLfloat x )
+
+
+static void GLAPIENTRY
+TAG(FogCoordfEXT)(GLfloat x)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR1F( VBO_ATTRIB_FOG, x );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1F(VBO_ATTRIB_FOG, x);
 }
 
-static void GLAPIENTRY TAG(FogCoordfvEXT)( const GLfloat *v )
+
+
+static void GLAPIENTRY
+TAG(FogCoordfvEXT)(const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR1FV( VBO_ATTRIB_FOG, v );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1FV(VBO_ATTRIB_FOG, v);
 }
 
-static void GLAPIENTRY TAG(Color3f)( GLfloat x, GLfloat y, GLfloat z )
+static void GLAPIENTRY
+TAG(Color3f)(GLfloat x, GLfloat y, GLfloat z)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR3F( VBO_ATTRIB_COLOR0, x, y, z );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3F(VBO_ATTRIB_COLOR0, x, y, z);
 }
 
-static void GLAPIENTRY TAG(Color3fv)( const GLfloat *v )
+static void GLAPIENTRY
+TAG(Color3fv)(const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR3FV( VBO_ATTRIB_COLOR0, v );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3FV(VBO_ATTRIB_COLOR0, v);
 }
 
-static void GLAPIENTRY TAG(Color4f)( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+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 );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4F(VBO_ATTRIB_COLOR0, x, y, z, w);
 }
 
-static void GLAPIENTRY TAG(Color4fv)( const GLfloat *v )
+static void GLAPIENTRY
+TAG(Color4fv)(const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR4FV( VBO_ATTRIB_COLOR0, v );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR4FV(VBO_ATTRIB_COLOR0, v);
 }
 
-static void GLAPIENTRY TAG(SecondaryColor3fEXT)( GLfloat x, GLfloat y, GLfloat z )
+
+
+static void GLAPIENTRY
+TAG(SecondaryColor3fEXT)(GLfloat x, GLfloat y, GLfloat z)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR3F( VBO_ATTRIB_COLOR1, x, y, z );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3F(VBO_ATTRIB_COLOR1, x, y, z);
 }
 
-static void GLAPIENTRY TAG(SecondaryColor3fvEXT)( const GLfloat *v )
+static void GLAPIENTRY
+TAG(SecondaryColor3fvEXT)(const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR3FV( VBO_ATTRIB_COLOR1, v );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR3FV(VBO_ATTRIB_COLOR1, v);
 }
 
 
-static void GLAPIENTRY TAG(EdgeFlag)( GLboolean b )
+
+static void GLAPIENTRY
+TAG(EdgeFlag)(GLboolean b)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR1F( VBO_ATTRIB_EDGEFLAG, (GLfloat)b );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1F(VBO_ATTRIB_EDGEFLAG, (GLfloat) b);
 }
 
-static void GLAPIENTRY TAG(Indexf)( GLfloat f )
+
+
+static void GLAPIENTRY
+TAG(Indexf)(GLfloat f)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR1F( VBO_ATTRIB_INDEX, f );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1F(VBO_ATTRIB_INDEX, f);
 }
 
-static void GLAPIENTRY TAG(Indexfv)( const GLfloat *f )
+static void GLAPIENTRY
+TAG(Indexfv)(const GLfloat * f)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   ATTR1FV( VBO_ATTRIB_INDEX, f );
+   GET_CURRENT_CONTEXT(ctx);
+   ATTR1FV(VBO_ATTRIB_INDEX, f);
 }
 
 
-static void GLAPIENTRY TAG(MultiTexCoord1f)( GLenum target, GLfloat x  )
+
+static void GLAPIENTRY
+TAG(MultiTexCoord1f)(GLenum target, GLfloat x)
 {
-   GET_CURRENT_CONTEXT( ctx );
+   GET_CURRENT_CONTEXT(ctx);
    GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
-   ATTR1F( attr, x );
+   ATTR1F(attr, x);
 }
 
-static void GLAPIENTRY TAG(MultiTexCoord1fv)( GLenum target, const GLfloat *v )
+static void GLAPIENTRY
+TAG(MultiTexCoord1fv)(GLenum target, const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
+   GET_CURRENT_CONTEXT(ctx);
    GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
-   ATTR1FV( attr, v );
+   ATTR1FV(attr, v);
 }
 
-static void GLAPIENTRY TAG(MultiTexCoord2f)( GLenum target, GLfloat x, GLfloat y )
+static void GLAPIENTRY
+TAG(MultiTexCoord2f)(GLenum target, GLfloat x, GLfloat y)
 {
-   GET_CURRENT_CONTEXT( ctx );
+   GET_CURRENT_CONTEXT(ctx);
    GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
-   ATTR2F( attr, x, y );
+   ATTR2F(attr, x, y);
 }
 
-static void GLAPIENTRY TAG(MultiTexCoord2fv)( GLenum target, const GLfloat *v )
+static void GLAPIENTRY
+TAG(MultiTexCoord2fv)(GLenum target, const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
+   GET_CURRENT_CONTEXT(ctx);
    GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
-   ATTR2FV( attr, v );
+   ATTR2FV(attr, v);
 }
 
-static void GLAPIENTRY TAG(MultiTexCoord3f)( GLenum target, GLfloat x, GLfloat y,
-				    GLfloat z)
+static void GLAPIENTRY
+TAG(MultiTexCoord3f)(GLenum target, GLfloat x, GLfloat y, GLfloat z)
 {
-   GET_CURRENT_CONTEXT( ctx );
+   GET_CURRENT_CONTEXT(ctx);
    GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
-   ATTR3F( attr, x, y, z );
+   ATTR3F(attr, x, y, z);
 }
 
-static void GLAPIENTRY TAG(MultiTexCoord3fv)( GLenum target, const GLfloat *v )
+static void GLAPIENTRY
+TAG(MultiTexCoord3fv)(GLenum target, const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
+   GET_CURRENT_CONTEXT(ctx);
    GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
-   ATTR3FV( attr, v );
+   ATTR3FV(attr, v);
 }
 
-static void GLAPIENTRY TAG(MultiTexCoord4f)( GLenum target, GLfloat x, GLfloat y,
-				    GLfloat z, GLfloat w )
+static void GLAPIENTRY
+TAG(MultiTexCoord4f)(GLenum target, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-   GET_CURRENT_CONTEXT( ctx );
+   GET_CURRENT_CONTEXT(ctx);
    GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
-   ATTR4F( attr, x, y, z, w );
+   ATTR4F(attr, x, y, z, w);
 }
 
-static void GLAPIENTRY TAG(MultiTexCoord4fv)( GLenum target, const GLfloat *v )
+static void GLAPIENTRY
+TAG(MultiTexCoord4fv)(GLenum target, const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
+   GET_CURRENT_CONTEXT(ctx);
    GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
-   ATTR4FV( attr, v );
+   ATTR4FV(attr, v);
 }
 
 
-static void GLAPIENTRY TAG(VertexAttrib1fARB)( GLuint index, GLfloat x )
+
+static void GLAPIENTRY
+TAG(VertexAttrib1fARB)(GLuint index, GLfloat x)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   if (index == 0) 
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
       ATTR1F(0, x);
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR1F(VBO_ATTRIB_GENERIC0 + index, x);
@@ -271,11 +322,11 @@ static void GLAPIENTRY TAG(VertexAttrib1fARB)( GLuint index, GLfloat x )
       ERROR();
 }
 
-static void GLAPIENTRY TAG(VertexAttrib1fvARB)( GLuint index, 
-					       const GLfloat *v )
+static void GLAPIENTRY
+TAG(VertexAttrib1fvARB)(GLuint index, const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   if (index == 0) 
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
       ATTR1FV(0, v);
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR1FV(VBO_ATTRIB_GENERIC0 + index, v);
@@ -283,11 +334,11 @@ static void GLAPIENTRY TAG(VertexAttrib1fvARB)( GLuint index,
       ERROR();
 }
 
-static void GLAPIENTRY TAG(VertexAttrib2fARB)( GLuint index, GLfloat x, 
-					      GLfloat y )
+static void GLAPIENTRY
+TAG(VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   if (index == 0) 
+   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);
@@ -295,11 +346,11 @@ static void GLAPIENTRY TAG(VertexAttrib2fARB)( GLuint index, GLfloat x,
       ERROR();
 }
 
-static void GLAPIENTRY TAG(VertexAttrib2fvARB)( GLuint index,
-					       const GLfloat *v )
+static void GLAPIENTRY
+TAG(VertexAttrib2fvARB)(GLuint index, const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   if (index == 0) 
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
       ATTR2FV(0, v);
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR2FV(VBO_ATTRIB_GENERIC0 + index, v);
@@ -307,11 +358,11 @@ static void GLAPIENTRY TAG(VertexAttrib2fvARB)( GLuint index,
       ERROR();
 }
 
-static void GLAPIENTRY TAG(VertexAttrib3fARB)( GLuint index, GLfloat x,
-					      GLfloat y, GLfloat z )
+static void GLAPIENTRY
+TAG(VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   if (index == 0) 
+   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);
@@ -319,11 +370,11 @@ static void GLAPIENTRY TAG(VertexAttrib3fARB)( GLuint index, GLfloat x,
       ERROR();
 }
 
-static void GLAPIENTRY TAG(VertexAttrib3fvARB)( GLuint index,
-					       const GLfloat *v )
+static void GLAPIENTRY
+TAG(VertexAttrib3fvARB)(GLuint index, const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   if (index == 0) 
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
       ATTR3FV(0, v);
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR3FV(VBO_ATTRIB_GENERIC0 + index, v);
@@ -331,12 +382,11 @@ static void GLAPIENTRY TAG(VertexAttrib3fvARB)( GLuint index,
       ERROR();
 }
 
-static void GLAPIENTRY TAG(VertexAttrib4fARB)( GLuint index, GLfloat x,
-					      GLfloat y, GLfloat z,
-					      GLfloat w )
+static void GLAPIENTRY
+TAG(VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   if (index == 0) 
+   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);
@@ -344,11 +394,11 @@ static void GLAPIENTRY TAG(VertexAttrib4fARB)( GLuint index, GLfloat x,
       ERROR();
 }
 
-static void GLAPIENTRY TAG(VertexAttrib4fvARB)( GLuint index, 
-					       const GLfloat *v )
+static void GLAPIENTRY
+TAG(VertexAttrib4fvARB)(GLuint index, const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   if (index == 0) 
+   GET_CURRENT_CONTEXT(ctx);
+   if (index == 0)
       ATTR4FV(0, v);
    else if (index < MAX_VERTEX_GENERIC_ATTRIBS)
       ATTR4FV(VBO_ATTRIB_GENERIC0 + index, v);
@@ -362,71 +412,73 @@ static void GLAPIENTRY TAG(VertexAttrib4fvARB)( GLuint index,
  * their property of aliasing with other attributes.  (See
  * vbo_save_loopback.c)
  */
-static void GLAPIENTRY TAG(VertexAttrib1fNV)( GLuint index, GLfloat x )
+static void GLAPIENTRY
+TAG(VertexAttrib1fNV)(GLuint index, GLfloat x)
 {
-   GET_CURRENT_CONTEXT( ctx );
+   GET_CURRENT_CONTEXT(ctx);
    if (index < VBO_ATTRIB_MAX)
       ATTR1F(index, x);
 }
 
-static void GLAPIENTRY TAG(VertexAttrib1fvNV)( GLuint index, 
-					       const GLfloat *v )
+static void GLAPIENTRY
+TAG(VertexAttrib1fvNV)(GLuint index, const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   if (index < VBO_ATTRIB_MAX) 
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
       ATTR1FV(index, v);
 }
 
-static void GLAPIENTRY TAG(VertexAttrib2fNV)( GLuint index, GLfloat x, 
-					      GLfloat y )
+static void GLAPIENTRY
+TAG(VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   if (index < VBO_ATTRIB_MAX) 
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
       ATTR2F(index, x, y);
 }
 
-static void GLAPIENTRY TAG(VertexAttrib2fvNV)( GLuint index,
-					       const GLfloat *v )
+static void GLAPIENTRY
+TAG(VertexAttrib2fvNV)(GLuint index, const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   if (index < VBO_ATTRIB_MAX) 
+   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 )
+static void GLAPIENTRY
+TAG(VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   if (index < VBO_ATTRIB_MAX) 
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
       ATTR3F(index, x, y, z);
 }
 
-static void GLAPIENTRY TAG(VertexAttrib3fvNV)( GLuint index,
-					       const GLfloat *v )
+static void GLAPIENTRY
+TAG(VertexAttrib3fvNV)(GLuint index,
+ const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   if (index < VBO_ATTRIB_MAX) 
+   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 )
+static void GLAPIENTRY
+TAG(VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   if (index < VBO_ATTRIB_MAX) 
+   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 )
+static void GLAPIENTRY
+TAG(VertexAttrib4fvNV)(GLuint index, const GLfloat * v)
 {
-   GET_CURRENT_CONTEXT( ctx );
-   if (index < VBO_ATTRIB_MAX) 
+   GET_CURRENT_CONTEXT(ctx);
+   if (index < VBO_ATTRIB_MAX)
       ATTR4FV(index, v);
 }
 
 
+
 #define MAT( ATTR, N, face, params )			\
 do {							\
    if (face != GL_BACK)					\
@@ -438,32 +490,33 @@ do {							\
 
 /* Colormaterial conflicts are dealt with later.
  */
-static void GLAPIENTRY TAG(Materialfv)( GLenum face, GLenum pname, 
-			       const GLfloat *params )
+static void GLAPIENTRY
+TAG(Materialfv)(GLenum face, GLenum pname,
+                 const GLfloat * params)
 {
-   GET_CURRENT_CONTEXT( ctx );
+   GET_CURRENT_CONTEXT(ctx);
    switch (pname) {
    case GL_EMISSION:
-      MAT( VBO_ATTRIB_MAT_FRONT_EMISSION, 4, face, params );
+      MAT(VBO_ATTRIB_MAT_FRONT_EMISSION, 4, face, params);
       break;
    case GL_AMBIENT:
-      MAT( VBO_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params );
+      MAT(VBO_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params);
       break;
    case GL_DIFFUSE:
-      MAT( VBO_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params );
+      MAT(VBO_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params);
       break;
    case GL_SPECULAR:
-      MAT( VBO_ATTRIB_MAT_FRONT_SPECULAR, 4, face, params );
+      MAT(VBO_ATTRIB_MAT_FRONT_SPECULAR, 4, face, params);
       break;
    case GL_SHININESS:
-      MAT( VBO_ATTRIB_MAT_FRONT_SHININESS, 1, face, params );
+      MAT(VBO_ATTRIB_MAT_FRONT_SHININESS, 1, face, params);
       break;
    case GL_COLOR_INDEXES:
-      MAT( VBO_ATTRIB_MAT_FRONT_INDEXES, 3, face, params );
+      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 );
+      MAT(VBO_ATTRIB_MAT_FRONT_AMBIENT, 4, face, params);
+      MAT(VBO_ATTRIB_MAT_FRONT_DIFFUSE, 4, face, params);
       break;
    default:
       ERROR();