Add some debug messages

[mesa.git] / src / mesa / x86 / gen_matypes.c

diff --git a/src/mesa/x86/gen_matypes.c b/src/mesa/x86/gen_matypes.c
index 8a86d6969484f061c0d71dcc2d6ce99ed616d1d6..e95f3d4f3d80213dba19f11e514917329ed7dd74 100644 (file)
--- a/src/mesa/x86/gen_matypes.c
+++ b/src/mesa/x86/gen_matypes.c
@@ -1,10 +1,8 @@
-/* $Id: gen_matypes.c,v 1.7 2002/02/15 16:32:36 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  6.5.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,7 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  * Authors:
- *    Gareth Hughes <gareth@valinux.com>
+ *    Gareth Hughes
  */
 
 /*
@@ -34,13 +32,10 @@
  * Mesa, including lighting, clipping, texture image conversion etc.
  */
 
-#ifdef PC_HEADER
-#include "all.h"
-#else
-#include "glheader.h"
-#include "mtypes.h"
+#include "main/glheader.h"
+#include "main/mtypes.h"
 #include "tnl/t_context.h"
-#endif
+
 
 #undef offsetof
 #define offsetof( type, member ) ((size_t) &((type *)0)->member)
@@ -66,11 +61,21 @@ do {                                                                        \
    printf( "\n" );                                                     \
 } while (0)
 
+#if defined(__BEOS__) || defined(_LP64)
+#define OFFSET( s, t, m )                                              \
+   printf( "#define %s\t%ld\n", s, offsetof( t, m ) );
+#else
 #define OFFSET( s, t, m )                                              \
    printf( "#define %s\t%d\n", s, offsetof( t, m ) );
+#endif
 
+#if defined(__BEOS__) || defined(_LP64)
+#define SIZEOF( s, t )                                                 \
+   printf( "#define %s\t%ld\n", s, sizeof(t) );
+#else
 #define SIZEOF( s, t )                                                 \
    printf( "#define %s\t%d\n", s, sizeof(t) );
+#endif
 
 #define DEFINE( s, d )                                                 \
    printf( "#define %s\t0x%x\n", s, d );
@@ -115,9 +120,6 @@ int main( int argc, char **argv )
    OFFSET( "VB_SIZE                ", struct vertex_buffer, Size );
    OFFSET( "VB_COUNT               ", struct vertex_buffer, Count );
    printf( "\n" );
-   OFFSET( "VB_FIRST_CLIPPED       ", struct vertex_buffer, FirstClipped );
-   OFFSET( "VB_FIRST_PRIMITIVE     ", struct vertex_buffer, FirstPrimitive );
-   printf( "\n" );
    OFFSET( "VB_ELTS                ", struct vertex_buffer, Elts );
    OFFSET( "VB_OBJ_PTR             ", struct vertex_buffer, ObjPtr );
    OFFSET( "VB_EYE_PTR             ", struct vertex_buffer, EyePtr );
@@ -135,16 +137,8 @@ int main( int argc, char **argv )
    OFFSET( "VB_COLOR_PTR           ", struct vertex_buffer, ColorPtr );
    OFFSET( "VB_SECONDARY_COLOR_PTR ", struct vertex_buffer, SecondaryColorPtr );
    OFFSET( "VB_FOG_COORD_PTR       ", struct vertex_buffer, FogCoordPtr );
-   OFFSET( "VB_POINT_SIZE_PTR      ", struct vertex_buffer, PointSizePtr );
-   OFFSET( "VB_MATERIAL            ", struct vertex_buffer, Material );
-   OFFSET( "VB_MATERIAL_MASK       ", struct vertex_buffer, MaterialMask );
-   OFFSET( "VB_FLAG                ", struct vertex_buffer, Flag );
    OFFSET( "VB_PRIMITIVE           ", struct vertex_buffer, Primitive );
-   OFFSET( "VB_PRIMITIVE_LENGTH    ", struct vertex_buffer, PrimitiveLength );
    printf( "\n" );
-   OFFSET( "VB_IMPORTABLE_DATA     ", struct vertex_buffer, importable_data );
-   printf( "\n" );
-   OFFSET( "VB_LAST_CLIPPED        ", struct vertex_buffer, LastClipped );
 
    DEFINE_HEADER( "struct vertex_buffer" );
 
@@ -154,40 +148,10 @@ int main( int argc, char **argv )
    DEFINE( "VERT_BIT_RGBA          ", VERT_BIT_COLOR0 );
    DEFINE( "VERT_BIT_SPEC_RGB      ", VERT_BIT_COLOR1 );
    DEFINE( "VERT_BIT_FOG_COORD     ", VERT_BIT_FOG );
-   DEFINE( "VERT_BIT_INDEX         ", VERT_BIT_INDEX );
-   DEFINE( "VERT_BIT_EDGE          ", VERT_BIT_EDGEFLAG );
    DEFINE( "VERT_BIT_TEX0          ", VERT_BIT_TEX0 );
    DEFINE( "VERT_BIT_TEX1          ", VERT_BIT_TEX1 );
    DEFINE( "VERT_BIT_TEX2          ", VERT_BIT_TEX2 );
    DEFINE( "VERT_BIT_TEX3          ", VERT_BIT_TEX3 );
-   DEFINE( "VERT_BIT_EVAL_C1       ", VERT_BIT_EVAL_C1 );
-   DEFINE( "VERT_BIT_EVAL_C2       ", VERT_BIT_EVAL_C2 );
-   DEFINE( "VERT_BIT_EVAL_P1       ", VERT_BIT_EVAL_P1 );
-   DEFINE( "VERT_BIT_EVAL_P2       ", VERT_BIT_EVAL_P2 );
-   DEFINE( "VERT_BIT_OBJ_3         ", VERT_BIT_OBJ_3 );
-   DEFINE( "VERT_BIT_OBJ_4         ", VERT_BIT_OBJ_4 );
-   DEFINE( "VERT_BIT_MATERIAL      ", VERT_BIT_MATERIAL );
-   DEFINE( "VERT_BIT_ELT           ", VERT_BIT_ELT );
-   DEFINE( "VERT_BIT_BEGIN         ", VERT_BIT_BEGIN );
-   DEFINE( "VERT_BIT_END           ", VERT_BIT_END );
-   DEFINE( "VERT_BIT_END_VB        ", VERT_BIT_END_VB );
-   DEFINE( "VERT_BIT_POINT_SIZE    ", VERT_BIT_POINT_SIZE );
-   DEFINE( "VERT_BIT_EYE           ", VERT_BIT_EYE );
-   DEFINE( "VERT_BIT_CLIP          ", VERT_BIT_CLIP );
-   printf( "\n" );
-   DEFINE( "VERT_BIT_OBJ_23        ", VERT_BIT_OBJ_3 );
-   DEFINE( "VERT_BIT_OBJ_234       ", VERT_BIT_OBJ_4 );
-
-
-   /* GLvector3f offsets:
-    */
-   OFFSET_HEADER( "GLvector3f" );
-
-   OFFSET( "V3F_DATA          ", GLvector3f, data );
-   OFFSET( "V3F_START         ", GLvector3f, start );
-   OFFSET( "V3F_COUNT         ", GLvector3f, count );
-   OFFSET( "V3F_STRIDE        ", GLvector3f, stride );
-   OFFSET( "V3F_FLAGS         ", GLvector3f, flags );
 
 
    /* GLvector4f offsets: