From bd1a9dacf6a45e6aa6954eeb490d55ebcc80ace8 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 5 Jan 2002 20:51:12 +0000 Subject: Vertex program checkpoint commit: converted all vertex attributes (color, normal, texcoords, fogcoord, secondary color, etc) to GLfloat[4] datatype. Aliasing of glVertex, glNormal, glColor, glFogCoord, etc. to glVertexAttrib now complete. --- src/mesa/tnl/t_imm_debug.c | 48 ++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 17 deletions(-) (limited to 'src/mesa/tnl/t_imm_debug.c') diff --git a/src/mesa/tnl/t_imm_debug.c b/src/mesa/tnl/t_imm_debug.c index 2bd36aa16e..0572d4c93c 100644 --- a/src/mesa/tnl/t_imm_debug.c +++ b/src/mesa/tnl/t_imm_debug.c @@ -1,4 +1,4 @@ -/* $Id: t_imm_debug.c,v 1.5 2001/12/14 02:51:45 brianp Exp $ */ +/* $Id: t_imm_debug.c,v 1.6 2002/01/05 20:51:13 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -91,16 +91,25 @@ void _tnl_print_cassette( struct immediate *IM ) fprintf(stderr, "%u: ", i); if (req & VERT_OBJ_234) { if (flags[i] & VERT_EVAL_C1) - fprintf(stderr, "EvalCoord %f ", IM->Obj[i][0]); + fprintf(stderr, "EvalCoord %f ", + IM->Attrib[VERT_ATTRIB_POS][i][0]); else if (flags[i] & VERT_EVAL_P1) - fprintf(stderr, "EvalPoint %.0f ", IM->Obj[i][0]); + fprintf(stderr, "EvalPoint %.0f ", + IM->Attrib[VERT_ATTRIB_POS][i][0]); else if (flags[i] & VERT_EVAL_C2) - fprintf(stderr, "EvalCoord %f %f ", IM->Obj[i][0], IM->Obj[i][1]); + fprintf(stderr, "EvalCoord %f %f ", + IM->Attrib[VERT_ATTRIB_POS][i][0], + IM->Attrib[VERT_ATTRIB_POS][i][1]); else if (flags[i] & VERT_EVAL_P2) - fprintf(stderr, "EvalPoint %.0f %.0f ", IM->Obj[i][0], IM->Obj[i][1]); + fprintf(stderr, "EvalPoint %.0f %.0f ", + IM->Attrib[VERT_ATTRIB_POS][i][0], + IM->Attrib[VERT_ATTRIB_POS][i][1]); else if (i < IM->Count && (flags[i]&VERT_OBJ_234)) { fprintf(stderr, "Obj %f %f %f %f", - IM->Obj[i][0], IM->Obj[i][1], IM->Obj[i][2], IM->Obj[i][3]); + IM->Attrib[VERT_ATTRIB_POS][i][0], + IM->Attrib[VERT_ATTRIB_POS][i][1], + IM->Attrib[VERT_ATTRIB_POS][i][2], + IM->Attrib[VERT_ATTRIB_POS][i][3]); } } @@ -109,33 +118,38 @@ void _tnl_print_cassette( struct immediate *IM ) if (req & flags[i] & VERT_NORMAL_BIT) fprintf(stderr, " Norm %f %f %f ", - IM->Normal[i][0], IM->Normal[i][1], IM->Normal[i][2]); + IM->Attrib[VERT_ATTRIB_NORMAL][i][0], + IM->Attrib[VERT_ATTRIB_NORMAL][i][1], + IM->Attrib[VERT_ATTRIB_NORMAL][i][2]); if (req & flags[i] & VERT_TEX_ANY) { GLuint j; for (j = 0 ; j < MAX_TEXTURE_UNITS ; j++) { if (req & flags[i] & VERT_TEX(j)) { - fprintf(stderr, - "TC%d %f %f %f %f", - j, - IM->TexCoord[j][i][0], IM->TexCoord[j][i][1], - IM->TexCoord[j][i][2], IM->TexCoord[j][i][2]); + fprintf(stderr, "TC%d %f %f %f %f", j, + IM->Attrib[VERT_ATTRIB_TEX0 + j][i][0], + IM->Attrib[VERT_ATTRIB_TEX0 + j][i][1], + IM->Attrib[VERT_ATTRIB_TEX0 + j][i][2], + IM->Attrib[VERT_ATTRIB_TEX0 + j][i][3]); } } } if (req & flags[i] & VERT_COLOR0_BIT) fprintf(stderr, " Rgba %f %f %f %f ", - IM->Color[i][0], IM->Color[i][1], - IM->Color[i][2], IM->Color[i][3]); + IM->Attrib[VERT_ATTRIB_COLOR0][i][0], + IM->Attrib[VERT_ATTRIB_COLOR0][i][1], + IM->Attrib[VERT_ATTRIB_COLOR0][i][2], + IM->Attrib[VERT_ATTRIB_COLOR0][i][3]); if (req & flags[i] & VERT_COLOR1_BIT) fprintf(stderr, " Spec %f %f %f ", - IM->SecondaryColor[i][0], IM->SecondaryColor[i][1], - IM->SecondaryColor[i][2]); + IM->Attrib[VERT_ATTRIB_COLOR1][i][0], + IM->Attrib[VERT_ATTRIB_COLOR1][i][1], + IM->Attrib[VERT_ATTRIB_COLOR1][i][2]); if (req & flags[i] & VERT_FOG_BIT) - fprintf(stderr, " Fog %f ", IM->FogCoord[i]); + fprintf(stderr, " Fog %f ", IM->Attrib[VERT_ATTRIB_FOG][i][0]); if (req & flags[i] & VERT_INDEX_BIT) fprintf(stderr, " Index %u ", IM->Index[i]); -- cgit v1.2.3