- 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.
2001-03-12 02:02:36 +00:00
parent d4eb665c60
commit 79b2d13ae2
8 changed files with 124 additions and 123 deletions
--- a/14
+++ b/14
@@ -1,4 +1,4 @@
-# $Id: Make-config,v 1.33 2000/11/03 01:37:10 brianp Exp $
+# $Id: Make-config,v 1.34 2001/03/12 02:02:36 gareth Exp $

 MESA_MAJOR=3
 MESA_MINOR=5
@@ -485,7 +485,7 @@ linux:
 	"GLW_LIB = libGLw.so" \
 	"OSMESA_LIB = libOSMesa.so" \
 	"CC = gcc" \
-	"CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
+	"CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
 	"MAKELIB = ../bin/mklib.linux" \
 	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
 	"GLU_LIB_DEPS = -L../lib -lGL -lm" \
@@ -500,7 +500,7 @@ linux-static:
 	"GLW_LIB = libGLw.a" \
 	"OSMESA_LIB = libOSMesa.a" \
 	"CC = gcc" \
-	"CFLAGS = -O3 -funroll-loops -ansi -pedantic -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
+	"CFLAGS = -O3 -funroll-loops -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include" \
 	"MAKELIB = ../bin/mklib.ar-ruv" \
 	"APP_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm -lpthread"

@@ -512,7 +512,7 @@ linux-trace:
 	"GLW_LIB = libGLw.so" \
 	"OSMESA_LIB = libOSMesa.so" \
 	"CC = gcc" \
-	"CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -DMESA_TRACE -I/usr/X11R6/include" \
+	"CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -DMESA_TRACE -I/usr/X11R6/include" \
 	"MAKELIB = ../bin/mklib.linux" \
 	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread" \
 	"GLU_LIB_DEPS = -L../lib -lGL -lm" \
@@ -527,7 +527,7 @@ linux-x86:
 	"GLW_LIB = libGLw.so" \
 	"OSMESA_LIB = libOSMesa.so" \
 	"CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
-	"CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include" \
+	"CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include" \
 	"MAKELIB = ../bin/mklib.linux" \
 	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
 	"GLU_LIB_DEPS = -L../lib -lGL -lm" \
@@ -558,7 +558,7 @@ linux-x86-static:
 	"GLW_LIB = libGLw.a" \
 	"OSMESA_LIB = libOSMesa.a" \
 	"CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
-	"CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include" \
+	"CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -ffast-math -funroll-loops -fomit-frame-pointer -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include" \
 	"MAKELIB = ../bin/mklib.ar-ruv" \
 	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
 	"GLU_LIB_DEPS = -L../lib -lGL -lm" \
@@ -1401,7 +1401,7 @@ linux-x86-debug:
 	"GLW_LIB = libGLw.so" \
 	"OSMESA_LIB = libOSMesa.so" \
 	"CC = gcc -malign-loops=2 -malign-jumps=2 -malign-functions=2" \
-	"CFLAGS = -O2 -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include -DDEBUG -DMESA_DEBUG" \
+	"CFLAGS = -O2 -g -ansi -pedantic -Wall -Wmissing-prototypes -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_KATMAI_ASM -DPTHREADS -I/usr/X11R6/include -DDEBUG -DMESA_DEBUG" \
 	"MAKELIB = ../bin/mklib.linux" \
 	"GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lm -lpthread" \
 	"GLU_LIB_DEPS = -L../lib -lGL -lm" \
--- 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,7 +30,7 @@


 #define COPY_FUNC( BITS )						\
-static void TAG2(copy, BITS)(GLvector4f *to, const GLvector4f *f,	\
+static void TAG2(copy, BITS)( GLvector4f *to, const GLvector4f *f,	\
 			      const GLubyte mask[] )			\
 {									\
   GLfloat (*t)[4] = (GLfloat (*)[4])to->start;				\
--- 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 );

--- 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;
--- 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,7 +245,7 @@ TAG(transform_rescale_normals)( const GLmatrix *mat,


 static void _XFORMAPI
-TAG(transform_normals_no_rot)(const GLmatrix *mat,
+TAG(transform_normals_no_rot)( const GLmatrix *mat,
 			       GLfloat scale,
 			       const GLvector3f *in,
 			       const GLfloat *lengths,
--- 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;
--- 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
--- 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