- Add -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L to linux builds, we've

  been using it with the DRI for long enough without any issues and we
  need it to include the katmai functions.
- Make katmai assembly work with the debug tests.
- A few general cleanups.

7 files changed, 117 insertions, 116 deletions

diff --git a/src/mesa/math/m_copy_tmp.h b/src/mesa/math/m_copy_tmp.h
index 609f5abdd8..019f3276b9 100644
--- a/src/mesa/math/m_copy_tmp.h
+++ b/src/mesa/math/m_copy_tmp.h
@@ -1,4 +1,4 @@
-/* $Id: m_copy_tmp.h,v 1.4 2001/03/12 00:48:41 gareth Exp $ */
+/* $Id: m_copy_tmp.h,v 1.5 2001/03/12 02:02:36 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -30,8 +30,8 @@
 
 
 #define COPY_FUNC( BITS )						\
-static void TAG2(copy, BITS)(GLvector4f *to, const GLvector4f *f,	\
-			     const GLubyte mask[] )			\
+static void TAG2(copy, BITS)( GLvector4f *to, const GLvector4f *f,	\
+			      const GLubyte mask[] )			\
 {									\
    GLfloat (*t)[4] = (GLfloat (*)[4])to->start;				\
    GLfloat *from = f->start;						\
diff --git a/src/mesa/math/m_debug_xform.c b/src/mesa/math/m_debug_xform.c
index 9600bec804..9636fc439d 100644
--- a/src/mesa/math/m_debug_xform.c
+++ b/src/mesa/math/m_debug_xform.c
@@ -1,4 +1,4 @@
-/* $Id: m_debug_xform.c,v 1.5 2001/03/12 00:48:41 gareth Exp $ */
+/* $Id: m_debug_xform.c,v 1.6 2001/03/12 02:02:36 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -155,7 +155,7 @@ static void ref_transform( GLvector4f *dst,
  * Vertex transformation tests
  */
 
-static GLfloat s[TEST_COUNT][5] ALIGN16;
+static GLfloat s[TEST_COUNT][4] ALIGN16;
 static GLfloat d[TEST_COUNT][4] ALIGN16;
 static GLfloat r[TEST_COUNT][4] ALIGN16;
 
@@ -182,6 +182,7 @@ static int test_transform_function( transform_func func, int psize, int mtype,
    mat->type = mtypes[mtype];
 
    m = mat->m;
+   ASSERT( ((GLuint)m & 15) == 0 );
 
    init_matrix( m );
 
diff --git a/src/mesa/math/m_dotprod_tmp.h b/src/mesa/math/m_dotprod_tmp.h
index 232c5389ca..86b71e6d7e 100644
--- a/src/mesa/math/m_dotprod_tmp.h
+++ b/src/mesa/math/m_dotprod_tmp.h
@@ -1,4 +1,4 @@
-/* $Id: m_dotprod_tmp.h,v 1.4 2001/03/12 00:48:41 gareth Exp $ */
+/* $Id: m_dotprod_tmp.h,v 1.5 2001/03/12 02:02:36 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -35,7 +35,7 @@ static void TAG(dotprod_vec2)( GLfloat *out,
 			       GLuint outstride,
 			       const GLvector4f *coord_vec,
 			       const GLfloat plane[4],
-			       const GLubyte mask[])
+			       const GLubyte mask[] )
 {
    GLuint stride = coord_vec->stride;
    GLfloat *coord = coord_vec->start;
@@ -60,7 +60,7 @@ static void TAG(dotprod_vec3)( GLfloat *out,
 			       GLuint outstride,
 			       const GLvector4f *coord_vec,
 			       const GLfloat plane[4],
-			       const GLubyte mask[])
+			       const GLubyte mask[] )
 {
    GLuint stride = coord_vec->stride;
    GLfloat *coord = coord_vec->start;
@@ -87,7 +87,7 @@ static void TAG(dotprod_vec4)( GLfloat *out,
 			       GLuint outstride,
 			       const GLvector4f *coord_vec,
 			       const GLfloat plane[4],
-			       const GLubyte mask[])
+			       const GLubyte mask[] )
 {
    GLuint stride = coord_vec->stride;
    GLfloat *coord = coord_vec->start;
diff --git a/src/mesa/math/m_norm_tmp.h b/src/mesa/math/m_norm_tmp.h
index aea3a4b65b..fbaa7e75c9 100644
--- a/src/mesa/math/m_norm_tmp.h
+++ b/src/mesa/math/m_norm_tmp.h
@@ -1,4 +1,4 @@
-/* $Id: m_norm_tmp.h,v 1.5 2001/03/12 00:48:41 gareth Exp $ */
+/* $Id: m_norm_tmp.h,v 1.6 2001/03/12 02:02:36 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -245,12 +245,12 @@ TAG(transform_rescale_normals)( const GLmatrix *mat,
 
 
 static void _XFORMAPI
-TAG(transform_normals_no_rot)(const GLmatrix *mat,
-                              GLfloat scale,
-                              const GLvector3f *in,
-                              const GLfloat *lengths,
-                              const GLubyte mask[],
-                              GLvector3f *dest )
+TAG(transform_normals_no_rot)( const GLmatrix *mat,
+			       GLfloat scale,
+			       const GLvector3f *in,
+			       const GLfloat *lengths,
+			       const GLubyte mask[],
+			       GLvector3f *dest )
 {
    GLuint i;
    const GLfloat *from = in->start;
diff --git a/src/mesa/math/m_trans_tmp.h b/src/mesa/math/m_trans_tmp.h
index e425d0584d..212499b352 100644
--- a/src/mesa/math/m_trans_tmp.h
+++ b/src/mesa/math/m_trans_tmp.h
@@ -1,4 +1,4 @@
-/* $Id: m_trans_tmp.h,v 1.4 2001/03/12 00:48:41 gareth Exp $ */
+/* $Id: m_trans_tmp.h,v 1.5 2001/03/12 02:02:36 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -39,7 +39,7 @@
 static void DEST_4F( GLfloat (*t)[4],
 		     CONST void *ptr,
 		     GLuint stride,
-		     ARGS)
+		     ARGS )
 {
    const GLubyte *f = (GLubyte *) ptr + SRC_START * stride;
    const GLubyte *first = f;
@@ -64,7 +64,7 @@ static void DEST_4F( GLfloat (*t)[4],
 static void DEST_3F( GLfloat (*t)[3],
 		     CONST void *ptr,
 		     GLuint stride,
-		     ARGS)
+		     ARGS )
 {
    const GLubyte *f = (GLubyte *) ptr + SRC_START * stride;
    const GLubyte *first = f;
@@ -86,7 +86,7 @@ static void DEST_3F( GLfloat (*t)[3],
 static void DEST_1F( GLfloat *t,
 		     CONST void *ptr,
 		     GLuint stride,
-		     ARGS)
+		     ARGS )
 {
    const GLubyte *f = (GLubyte *) ptr + SRC_START * stride;
    const GLubyte *first = f;
@@ -106,7 +106,7 @@ static void DEST_1F( GLfloat *t,
 static void DEST_4UB( GLubyte (*t)[4],
                       CONST void *ptr,
                       GLuint stride,
-                      ARGS)
+                      ARGS )
 {
    const GLubyte *f = (GLubyte *) ptr + SRC_START * stride;
    const GLubyte *first = f;
@@ -130,7 +130,7 @@ static void DEST_4UB( GLubyte (*t)[4],
 static void DEST_4US( GLushort (*t)[4],
                       CONST void *ptr,
                       GLuint stride,
-                      ARGS)
+                      ARGS )
 {
    const GLushort *f = (GLushort *) ptr + SRC_START * stride;
    const GLushort *first = f;
@@ -154,7 +154,7 @@ static void DEST_4US( GLushort (*t)[4],
 static void DEST_1UB( GLubyte *t,
 		      CONST void *ptr,
 		      GLuint stride,
-		      ARGS)
+		      ARGS )
 {
    const GLubyte *f = (GLubyte *) ptr + SRC_START * stride;
    const GLubyte *first = f;
@@ -175,7 +175,7 @@ static void DEST_1UB( GLubyte *t,
 static void DEST_1UI( GLuint *t,
 		      CONST void *ptr,
 		      GLuint stride,
-		      ARGS)
+		      ARGS )
 {
    const GLubyte *f = (GLubyte *) ptr + SRC_START * stride;
    const GLubyte *first = f;
diff --git a/src/mesa/math/m_xform.h b/src/mesa/math/m_xform.h
index 3e24ceac4a..d9e12407ee 100644
--- a/src/mesa/math/m_xform.h
+++ b/src/mesa/math/m_xform.h
@@ -1,4 +1,4 @@
-/* $Id: m_xform.h,v 1.8 2001/03/12 00:48:41 gareth Exp $ */
+/* $Id: m_xform.h,v 1.9 2001/03/12 02:02:36 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -186,15 +186,15 @@ typedef void (_XFORMAPIP transform_func)( GLvector4f *to_vec,
 
 
 extern GLvector4f *_mesa_project_points( GLvector4f *to,
-				      CONST GLvector4f *from );
+					 CONST GLvector4f *from );
 
 extern void _mesa_transform_bounds3( GLubyte *orMask, GLubyte *andMask,
-				  CONST GLfloat m[16],
-				  CONST GLfloat src[][3] );
+				     CONST GLfloat m[16],
+				     CONST GLfloat src[][3] );
 
 extern void _mesa_transform_bounds2( GLubyte *orMask, GLubyte *andMask,
-				  CONST GLfloat m[16],
-				  CONST GLfloat src[][3] );
+				     CONST GLfloat m[16],
+				     CONST GLfloat src[][3] );
 
 
 extern dotprod_func  _mesa_dotprod_tab[2][5];
@@ -211,7 +211,7 @@ extern transform_func **(_mesa_transform_tab[2]);
 
 
 extern void _mesa_transform_point_sz( GLfloat Q[4], CONST GLfloat M[16],
-				   CONST GLfloat P[4], GLuint sz );
+				      CONST GLfloat P[4], GLuint sz );
 
 
 #define TransformRaw( to, mat, from ) \
diff --git a/src/mesa/math/m_xform_tmp.h b/src/mesa/math/m_xform_tmp.h
index dd5a233b5c..8d96e6af71 100644
--- a/src/mesa/math/m_xform_tmp.h
+++ b/src/mesa/math/m_xform_tmp.h
@@ -1,4 +1,4 @@
-/* $Id: m_xform_tmp.h,v 1.4 2001/03/12 00:48:41 gareth Exp $ */
+/* $Id: m_xform_tmp.h,v 1.5 2001/03/12 02:02:36 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -68,9 +68,9 @@
 static void _XFORMAPI
 TAG(transform_points1_general)( GLvector4f *to_vec,
 				const GLfloat m[16],
-					    const GLvector4f *from_vec,
-					    const GLubyte *mask,
-					    const GLubyte flag )
+				const GLvector4f *from_vec,
+				const GLubyte *mask,
+				const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -101,9 +101,9 @@ TAG(transform_points1_general)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points1_identity)( GLvector4f *to_vec,
 				 const GLfloat m[16],
-					     const GLvector4f *from_vec,
-					     const GLubyte *mask,
-					     const GLubyte flag )
+				 const GLvector4f *from_vec,
+				 const GLubyte *mask,
+				 const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -127,9 +127,9 @@ TAG(transform_points1_identity)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points1_2d)( GLvector4f *to_vec,
 			   const GLfloat m[16],
-				       const GLvector4f *from_vec,
-				       const GLubyte *mask,
-				       const GLubyte flag )
+			   const GLvector4f *from_vec,
+			   const GLubyte *mask,
+			   const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -155,9 +155,9 @@ TAG(transform_points1_2d)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points1_2d_no_rot)( GLvector4f *to_vec,
 				  const GLfloat m[16],
-					      const GLvector4f *from_vec,
-					      const GLubyte *mask,
-					      const GLubyte flag )
+				  const GLvector4f *from_vec,
+				  const GLubyte *mask,
+				  const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -183,9 +183,9 @@ TAG(transform_points1_2d_no_rot)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points1_3d)( GLvector4f *to_vec,
 			   const GLfloat m[16],
-				       const GLvector4f *from_vec,
-				       const GLubyte *mask,
-				       const GLubyte flag )
+			   const GLvector4f *from_vec,
+			   const GLubyte *mask,
+			   const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -213,9 +213,9 @@ TAG(transform_points1_3d)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points1_3d_no_rot)( GLvector4f *to_vec,
 				  const GLfloat m[16],
-					      const GLvector4f *from_vec,
-					      const GLubyte *mask,
-					      const GLubyte flag )
+				  const GLvector4f *from_vec,
+				  const GLubyte *mask,
+				  const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -242,9 +242,9 @@ TAG(transform_points1_3d_no_rot)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points1_perspective)( GLvector4f *to_vec,
 				    const GLfloat m[16],
-						const GLvector4f *from_vec,
-						const GLubyte *mask,
-						const GLubyte flag )
+				    const GLvector4f *from_vec,
+				    const GLubyte *mask,
+				    const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -278,9 +278,9 @@ TAG(transform_points1_perspective)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points2_general)( GLvector4f *to_vec,
 				const GLfloat m[16],
-					    const GLvector4f *from_vec,
-					    const GLubyte *mask,
-					    const GLubyte flag )
+				const GLvector4f *from_vec,
+				const GLubyte *mask,
+				const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -310,9 +310,9 @@ TAG(transform_points2_general)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points2_identity)( GLvector4f *to_vec,
 				 const GLfloat m[16],
-					     const GLvector4f *from_vec,
-					     const GLubyte *mask,
-					     const GLubyte flag )
+				 const GLvector4f *from_vec,
+				 const GLubyte *mask,
+				 const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -336,9 +336,9 @@ TAG(transform_points2_identity)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points2_2d)( GLvector4f *to_vec,
 			   const GLfloat m[16],
-				       const GLvector4f *from_vec,
-				       const GLubyte *mask,
-				       const GLubyte flag )
+			   const GLvector4f *from_vec,
+			   const GLubyte *mask,
+			   const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -365,9 +365,9 @@ TAG(transform_points2_2d)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points2_2d_no_rot)( GLvector4f *to_vec,
 				  const GLfloat m[16],
-					      const GLvector4f *from_vec,
-					      const GLubyte *mask,
-					      const GLubyte flag )
+				  const GLvector4f *from_vec,
+				  const GLubyte *mask,
+				  const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -393,9 +393,9 @@ TAG(transform_points2_2d_no_rot)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points2_3d)( GLvector4f *to_vec,
 			   const GLfloat m[16],
-				       const GLvector4f *from_vec,
-				       const GLubyte *mask,
-				       const GLubyte flag )
+			   const GLvector4f *from_vec,
+			   const GLubyte *mask,
+			   const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -426,9 +426,9 @@ TAG(transform_points2_3d)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points2_3d_no_rot)( GLvector4f *to_vec,
 				  const GLfloat m[16],
-					      const GLvector4f *from_vec,
-					      const GLubyte *mask,
-					      const GLubyte flag )
+				  const GLvector4f *from_vec,
+				  const GLubyte *mask,
+				  const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -461,9 +461,9 @@ TAG(transform_points2_3d_no_rot)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points2_perspective)( GLvector4f *to_vec,
 				    const GLfloat m[16],
-						const GLvector4f *from_vec,
-						const GLubyte *mask,
-						const GLubyte flag )
+				    const GLvector4f *from_vec,
+				    const GLubyte *mask,
+				    const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -492,9 +492,9 @@ TAG(transform_points2_perspective)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points3_general)( GLvector4f *to_vec,
 				const GLfloat m[16],
-					    const GLvector4f *from_vec,
-					    const GLubyte *mask,
-					    const GLubyte flag )
+				const GLvector4f *from_vec,
+				const GLubyte *mask,
+				const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -524,9 +524,9 @@ TAG(transform_points3_general)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points3_identity)( GLvector4f *to_vec,
 				 const GLfloat m[16],
-					     const GLvector4f *from_vec,
-					     const GLubyte *mask,
-					     const GLubyte flag )
+				 const GLvector4f *from_vec,
+				 const GLubyte *mask,
+				 const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -551,9 +551,9 @@ TAG(transform_points3_identity)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points3_2d)( GLvector4f *to_vec,
 			   const GLfloat m[16],
-				       const GLvector4f *from_vec,
-				       const GLubyte *mask,
-				       const GLubyte flag )
+			   const GLvector4f *from_vec,
+			   const GLubyte *mask,
+			   const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -580,9 +580,9 @@ TAG(transform_points3_2d)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points3_2d_no_rot)( GLvector4f *to_vec,
 				  const GLfloat m[16],
-					      const GLvector4f *from_vec,
-					      const GLubyte *mask,
-					      const GLubyte flag )
+				  const GLvector4f *from_vec,
+				  const GLubyte *mask,
+				  const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -608,9 +608,9 @@ TAG(transform_points3_2d_no_rot)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points3_3d)( GLvector4f *to_vec,
 			   const GLfloat m[16],
-				       const GLvector4f *from_vec,
-				       const GLubyte *mask,
-				       const GLubyte flag )
+			   const GLvector4f *from_vec,
+			   const GLubyte *mask,
+			   const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -640,9 +640,9 @@ TAG(transform_points3_3d)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points3_3d_no_rot)( GLvector4f *to_vec,
 				  const GLfloat m[16],
-					      const GLvector4f *from_vec,
-					      const GLubyte *mask,
-					      const GLubyte flag )
+				  const GLvector4f *from_vec,
+				  const GLubyte *mask,
+				  const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -669,9 +669,9 @@ TAG(transform_points3_3d_no_rot)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points3_perspective)( GLvector4f *to_vec,
 				    const GLfloat m[16],
-						const GLvector4f *from_vec,
-						const GLubyte *mask,
-						const GLubyte flag )
+				    const GLvector4f *from_vec,
+				    const GLubyte *mask,
+				    const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -701,9 +701,9 @@ TAG(transform_points3_perspective)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points4_general)( GLvector4f *to_vec,
 				const GLfloat m[16],
-					    const GLvector4f *from_vec,
-					    const GLubyte *mask,
-					    const GLubyte flag )
+				const GLvector4f *from_vec,
+				const GLubyte *mask,
+				const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -733,9 +733,9 @@ TAG(transform_points4_general)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points4_identity)( GLvector4f *to_vec,
 				 const GLfloat m[16],
-					     const GLvector4f *from_vec,
-					     const GLubyte *mask,
-					     const GLubyte flag )
+				 const GLvector4f *from_vec,
+				 const GLubyte *mask,
+				 const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -761,9 +761,9 @@ TAG(transform_points4_identity)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points4_2d)( GLvector4f *to_vec,
 			   const GLfloat m[16],
-				       const GLvector4f *from_vec,
-				       const GLubyte *mask,
-				       const GLubyte flag )
+			   const GLvector4f *from_vec,
+			   const GLubyte *mask,
+			   const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -791,9 +791,9 @@ TAG(transform_points4_2d)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points4_2d_no_rot)( GLvector4f *to_vec,
 				  const GLfloat m[16],
-					      const GLvector4f *from_vec,
-					      const GLubyte *mask,
-					      const GLubyte flag )
+				  const GLvector4f *from_vec,
+				  const GLubyte *mask,
+				  const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -820,9 +820,9 @@ TAG(transform_points4_2d_no_rot)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points4_3d)( GLvector4f *to_vec,
 			   const GLfloat m[16],
-				       const GLvector4f *from_vec,
-				       const GLubyte *mask,
-				       const GLubyte flag )
+			   const GLvector4f *from_vec,
+			   const GLubyte *mask,
+			   const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -851,9 +851,9 @@ TAG(transform_points4_3d)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points4_3d_no_rot)( GLvector4f *to_vec,
 				  const GLfloat m[16],
-					      const GLvector4f *from_vec,
-					      const GLubyte *mask,
-					      const GLubyte flag )
+				  const GLvector4f *from_vec,
+				  const GLubyte *mask,
+				  const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;
@@ -881,9 +881,9 @@ TAG(transform_points4_3d_no_rot)( GLvector4f *to_vec,
 static void _XFORMAPI
 TAG(transform_points4_perspective)( GLvector4f *to_vec,
 				    const GLfloat m[16],
-						const GLvector4f *from_vec,
-						const GLubyte *mask,
-						const GLubyte flag )
+				    const GLvector4f *from_vec,
+				    const GLubyte *mask,
+				    const GLubyte flag )
 {
    const GLuint stride = from_vec->stride;
    GLfloat *from = from_vec->start;