X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fx86%2Fgen_matypes.c;h=d56b701aa8c1f1a189558aa2fd76c657909fe862;hb=47a385b43be9cf2ef0d0b24b1d588dc26940dfe6;hp=990034fdf6172f03f939cdd1f6fb4b1c3bb272f8;hpb=0a59ca6cae6ef24990f1c41c8c7857214489443c;p=mesa.git diff --git a/src/mesa/x86/gen_matypes.c b/src/mesa/x86/gen_matypes.c index 990034fdf61..d56b701aa8c 100644 --- a/src/mesa/x86/gen_matypes.c +++ b/src/mesa/x86/gen_matypes.c @@ -1,10 +1,8 @@ -/* $Id: gen_matypes.c,v 1.1 2001/03/28 20:44:44 gareth 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 Hughes */ /* @@ -34,14 +32,10 @@ * Mesa, including lighting, clipping, texture image conversion etc. */ -#ifdef PC_HEADER -#include "all.h" -#else -#include "glheader.h" -#include "context.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) @@ -67,11 +61,21 @@ do { \ printf( "\n" ); \ } while (0) +#if defined(__BEOS__) || defined(__HAIKU__) || 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(__HAIKU__) || 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 ); @@ -88,7 +92,6 @@ int main( int argc, char **argv ) printf( "#ifndef __ASM_TYPES_H__\n" ); printf( "#define __ASM_TYPES_H__\n" ); printf( "\n" ); - printf( "#include \"assyntax.h\"\n" ); /* GLcontext offsets: @@ -107,7 +110,6 @@ int main( int argc, char **argv ) OFFSET( "CTX_LIGHT_NEED_VERTS ", GLcontext, Light._NeedVertices ); OFFSET( "CTX_LIGHT_FLAGS ", GLcontext, Light._Flags ); OFFSET( "CTX_LIGHT_BASE_COLOR ", GLcontext, Light._BaseColor ); - OFFSET( "CTX_LIGHT_BASE_ALPHA ", GLcontext, Light._BaseAlpha ); /* struct vertex_buffer offsets: @@ -117,14 +119,11 @@ 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 ); OFFSET( "VB_CLIP_PTR ", struct vertex_buffer, ClipPtr ); - OFFSET( "VB_PROJ_CLIP_PTR ", struct vertex_buffer, ProjectedClipPtr ); + OFFSET( "VB_PROJ_CLIP_PTR ", struct vertex_buffer, NdcPtr ); OFFSET( "VB_CLIP_OR_MASK ", struct vertex_buffer, ClipOrMask ); OFFSET( "VB_CLIP_MASK ", struct vertex_buffer, ClipMask ); OFFSET( "VB_NORMAL_PTR ", struct vertex_buffer, NormalPtr ); @@ -137,58 +136,21 @@ 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" ); - DEFINE( "VERT_OBJ ", VERT_OBJ ); - DEFINE( "VERT_RGBA ", VERT_RGBA ); - DEFINE( "VERT_NORM ", VERT_NORM ); - DEFINE( "VERT_INDEX ", VERT_INDEX ); - DEFINE( "VERT_EDGE ", VERT_EDGE ); - DEFINE( "VERT_SPEC_RGB ", VERT_SPEC_RGB ); - DEFINE( "VERT_FOG_COORD ", VERT_FOG_COORD ); - DEFINE( "VERT_TEX0 ", VERT_TEX0 ); - DEFINE( "VERT_TEX1 ", VERT_TEX1 ); - DEFINE( "VERT_TEX2 ", VERT_TEX2 ); - DEFINE( "VERT_TEX3 ", VERT_TEX3 ); - DEFINE( "VERT_EVAL_C1 ", VERT_EVAL_C1 ); - DEFINE( "VERT_EVAL_C2 ", VERT_EVAL_C2 ); - DEFINE( "VERT_EVAL_P1 ", VERT_EVAL_P1 ); - DEFINE( "VERT_EVAL_P2 ", VERT_EVAL_P2 ); - DEFINE( "VERT_OBJ_3 ", VERT_OBJ_3 ); - DEFINE( "VERT_OBJ_4 ", VERT_OBJ_4 ); - DEFINE( "VERT_MATERIAL ", VERT_MATERIAL ); - DEFINE( "VERT_ELT ", VERT_ELT ); - DEFINE( "VERT_BEGIN ", VERT_BEGIN ); - DEFINE( "VERT_END ", VERT_END ); - DEFINE( "VERT_END_VB ", VERT_END_VB ); - DEFINE( "VERT_POINT_SIZE ", VERT_POINT_SIZE ); - DEFINE( "VERT_EYE ", VERT_EYE ); - DEFINE( "VERT_CLIP ", VERT_CLIP ); - printf( "\n" ); - DEFINE( "VERT_OBJ_23 ", VERT_OBJ_3 ); - DEFINE( "VERT_OBJ_234 ", VERT_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 ); + /* XXX use new labels here someday after vertex proram is done */ + DEFINE( "VERT_BIT_OBJ ", VERT_BIT_POS ); + DEFINE( "VERT_BIT_NORM ", VERT_BIT_NORMAL ); + 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_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 ); /* GLvector4f offsets: @@ -235,7 +197,7 @@ int main( int argc, char **argv ) OFFSET( "LIGHT_DIFFUSE ", struct gl_light, Diffuse ); OFFSET( "LIGHT_SPECULAR ", struct gl_light, Specular ); OFFSET( "LIGHT_EYE_POSITION ", struct gl_light, EyePosition ); - OFFSET( "LIGHT_EYE_DIRECTION ", struct gl_light, EyeDirection ); + OFFSET( "LIGHT_SPOT_DIRECTION ", struct gl_light, SpotDirection ); OFFSET( "LIGHT_SPOT_EXPONENT ", struct gl_light, SpotExponent ); OFFSET( "LIGHT_SPOT_CUTOFF ", struct gl_light, SpotCutoff ); OFFSET( "LIGHT_COS_CUTOFF ", struct gl_light, _CosCutoff ); @@ -249,7 +211,7 @@ int main( int argc, char **argv ) OFFSET( "LIGHT_POSITION ", struct gl_light, _Position ); OFFSET( "LIGHT_VP_INF_NORM ", struct gl_light, _VP_inf_norm ); OFFSET( "LIGHT_H_INF_NORM ", struct gl_light, _h_inf_norm ); - OFFSET( "LIGHT_NORM_DIRECTION ", struct gl_light, _NormDirection ); + OFFSET( "LIGHT_NORM_DIRECTION ", struct gl_light, _NormSpotDirection ); OFFSET( "LIGHT_VP_INF_SPOT_ATTEN ", struct gl_light, _VP_inf_spot_attenuation ); printf( "\n" ); OFFSET( "LIGHT_SPOT_EXP_TABLE ", struct gl_light, _SpotExpTable );