X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Ftnl%2Ft_imm_debug.c;h=856eaa75f7a730c8abfc00e9641ffb5334734d35;hb=5ac9e660a65f4ab06120abbc20598a93a87ded49;hp=d641ee10493567b5060c6db0f663e937192beb6e;hpb=51c0c71811508b6658e0d5dcff8426b618322a73;p=mesa.git diff --git a/src/mesa/tnl/t_imm_debug.c b/src/mesa/tnl/t_imm_debug.c index d641ee10493..856eaa75f7a 100644 --- a/src/mesa/tnl/t_imm_debug.c +++ b/src/mesa/tnl/t_imm_debug.c @@ -1,10 +1,9 @@ -/* $Id: t_imm_debug.c,v 1.3 2001/04/28 08:39:18 keithw Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 5.1 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2002 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"), @@ -25,39 +24,42 @@ */ #include "mtypes.h" +#include "context.h" +#include "imports.h" #include "t_context.h" #include "t_imm_debug.h" + void _tnl_print_vert_flags( const char *name, GLuint flags ) { - fprintf(stderr, + _mesa_debug(NULL, "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", name, flags, - (flags & VERT_CLIP) ? "clip/proj-clip/glend, " : "", - (flags & VERT_EDGE) ? "edgeflag, " : "", - (flags & VERT_ELT) ? "array-elt, " : "", - (flags & VERT_END_VB) ? "end-vb, " : "", - (flags & VERT_EVAL_ANY) ? "eval-coord, " : "", - (flags & VERT_EYE) ? "eye/glbegin, " : "", - (flags & VERT_FOG_COORD) ? "fog-coord, " : "", - (flags & VERT_INDEX) ? "index, " : "", - (flags & VERT_MATERIAL) ? "material, " : "", - (flags & VERT_NORM) ? "normals, " : "", - (flags & VERT_OBJ) ? "obj, " : "", - (flags & VERT_OBJ_3) ? "obj-3, " : "", - (flags & VERT_OBJ_4) ? "obj-4, " : "", - (flags & VERT_POINT_SIZE) ? "point-size, " : "", - (flags & VERT_RGBA) ? "colors, " : "", - (flags & VERT_SPEC_RGB) ? "specular, " : "", - (flags & VERT_TEX0) ? "texcoord0, " : "", - (flags & VERT_TEX1) ? "texcoord1, " : "", - (flags & VERT_TEX2) ? "texcoord2, " : "", - (flags & VERT_TEX3) ? "texcoord3, " : "", - (flags & VERT_TEX4) ? "texcoord4, " : "", - (flags & VERT_TEX5) ? "texcoord5, " : "", - (flags & VERT_TEX6) ? "texcoord6, " : "", - (flags & VERT_TEX7) ? "texcoord7, " : "" + (flags & VERT_BIT_CLIP) ? "clip/proj-clip/glend, " : "", + (flags & VERT_BIT_EDGEFLAG) ? "edgeflag, " : "", + (flags & VERT_BIT_ELT) ? "array-elt, " : "", + (flags & VERT_BIT_END_VB) ? "end-vb, " : "", + (flags & VERT_BITS_EVAL_ANY) ? "eval-coord, " : "", + (flags & VERT_BIT_EYE) ? "eye/glbegin, " : "", + (flags & VERT_BIT_FOG) ? "fog-coord, " : "", + (flags & VERT_BIT_INDEX) ? "index, " : "", + (flags & VERT_BIT_MATERIAL) ? "material, " : "", + (flags & VERT_BIT_NORMAL) ? "normals, " : "", + (flags & VERT_BIT_POS) ? "obj, " : "", + (flags & VERT_BIT_OBJ_3) ? "obj-3, " : "", + (flags & VERT_BIT_OBJ_4) ? "obj-4, " : "", + (flags & VERT_BIT_POINT_SIZE) ? "point-size, " : "", + (flags & VERT_BIT_COLOR0) ? "colors, " : "", + (flags & VERT_BIT_COLOR1) ? "specular, " : "", + (flags & VERT_BIT_TEX0) ? "texcoord0, " : "", + (flags & VERT_BIT_TEX1) ? "texcoord1, " : "", + (flags & VERT_BIT_TEX2) ? "texcoord2, " : "", + (flags & VERT_BIT_TEX3) ? "texcoord3, " : "", + (flags & VERT_BIT_TEX4) ? "texcoord4, " : "", + (flags & VERT_BIT_TEX5) ? "texcoord5, " : "", + (flags & VERT_BIT_TEX6) ? "texcoord6, " : "", + (flags & VERT_BIT_TEX7) ? "texcoord7, " : "" ); } @@ -66,11 +68,11 @@ void _tnl_print_cassette( struct immediate *IM ) GLuint i; GLuint *flags = IM->Flag; GLuint andflag = IM->CopyAndFlag; - GLuint orflag = IM->CopyOrFlag; + GLuint orflag = (IM->CopyOrFlag|IM->Evaluated); GLuint state = IM->BeginState; GLuint req = ~0; - fprintf(stderr, "Cassette id %d, %u rows.\n", IM->id, + _mesa_debug(NULL, "Cassette id %d, %u rows.\n", IM->id, IM->Count - IM->CopyStart); _tnl_print_vert_flags("Contains at least one", orflag); @@ -79,7 +81,7 @@ void _tnl_print_cassette( struct immediate *IM ) { _tnl_print_vert_flags("Contains a full complement of", andflag); - fprintf(stderr, "Final begin/end state %s/%s, errors %s/%s\n", + _mesa_debug(NULL, "Final begin/end state %s/%s, errors %s/%s\n", (state & VERT_BEGIN_0) ? "in" : "out", (state & VERT_BEGIN_1) ? "in" : "out", (state & VERT_ERROR_0) ? "y" : "n", @@ -88,79 +90,93 @@ void _tnl_print_cassette( struct immediate *IM ) } for (i = IM->CopyStart ; i <= IM->Count ; i++) { - fprintf(stderr, "%u: ", i); - if (req & VERT_OBJ_234) { - if (flags[i] & VERT_EVAL_C1) - fprintf(stderr, "EvalCoord %f ", IM->Obj[i][0]); - else if (flags[i] & VERT_EVAL_P1) - fprintf(stderr, "EvalPoint %.0f ", IM->Obj[i][0]); - else if (flags[i] & VERT_EVAL_C2) - fprintf(stderr, "EvalCoord %f %f ", IM->Obj[i][0], IM->Obj[i][1]); - else if (flags[i] & VERT_EVAL_P2) - fprintf(stderr, "EvalPoint %.0f %.0f ", IM->Obj[i][0], IM->Obj[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]); + _mesa_debug(NULL, "%u: ", i); + if (req & VERT_BITS_OBJ_234) { + if (flags[i] & VERT_BIT_EVAL_C1) + _mesa_debug(NULL, "EvalCoord %f ", + IM->Attrib[VERT_ATTRIB_POS][i][0]); + else if (flags[i] & VERT_BIT_EVAL_P1) + _mesa_debug(NULL, "EvalPoint %.0f ", + IM->Attrib[VERT_ATTRIB_POS][i][0]); + else if (flags[i] & VERT_BIT_EVAL_C2) + _mesa_debug(NULL, "EvalCoord %f %f ", + IM->Attrib[VERT_ATTRIB_POS][i][0], + IM->Attrib[VERT_ATTRIB_POS][i][1]); + else if (flags[i] & VERT_BIT_EVAL_P2) + _mesa_debug(NULL, "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_BITS_OBJ_234)) { + _mesa_debug(NULL, "Obj %f %f %f %f", + 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]); } } - if (req & flags[i] & VERT_ELT) - fprintf(stderr, " Elt %u\t", IM->Elt[i]); + if (req & flags[i] & VERT_BIT_ELT) + _mesa_debug(NULL, " Elt %u\t", IM->Elt[i]); - if (req & flags[i] & VERT_NORM) - fprintf(stderr, " Norm %f %f %f ", - IM->Normal[i][0], IM->Normal[i][1], IM->Normal[i][2]); + if (req & flags[i] & VERT_BIT_NORMAL) + _mesa_debug(NULL, " Norm %f %f %f ", + 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) { + if (req & flags[i] & VERT_BITS_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]); + for (j = 0 ; j < MAX_TEXTURE_COORD_UNITS ; j++) { + if (req & flags[i] & VERT_BIT_TEX(j)) { + _mesa_debug(NULL, "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_RGBA) - fprintf(stderr, " Rgba %f %f %f %f ", - IM->Color[i][0], IM->Color[i][1], - IM->Color[i][2], IM->Color[i][3]); + if (req & flags[i] & VERT_BIT_COLOR0) + _mesa_debug(NULL, " Rgba %f %f %f %f ", + 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_SPEC_RGB) - fprintf(stderr, " Spec %f %f %f ", - IM->SecondaryColor[i][0], IM->SecondaryColor[i][1], - IM->SecondaryColor[i][2]); + if (req & flags[i] & VERT_BIT_COLOR1) + _mesa_debug(NULL, " Spec %f %f %f ", + 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_COORD) - fprintf(stderr, " Fog %f ", IM->FogCoord[i]); + if (req & flags[i] & VERT_BIT_FOG) + _mesa_debug(NULL, " Fog %f ", IM->Attrib[VERT_ATTRIB_FOG][i][0]); - if (req & flags[i] & VERT_INDEX) - fprintf(stderr, " Index %u ", IM->Index[i]); + if (req & flags[i] & VERT_BIT_INDEX) + _mesa_debug(NULL, " Index %u ", IM->Index[i]); - if (req & flags[i] & VERT_EDGE) - fprintf(stderr, " Edgeflag %d ", IM->EdgeFlag[i]); + if (req & flags[i] & VERT_BIT_EDGEFLAG) + _mesa_debug(NULL, " Edgeflag %d ", IM->EdgeFlag[i]); - if (req & flags[i] & VERT_MATERIAL) - fprintf(stderr, " Material "); + if (req & flags[i] & VERT_BIT_MATERIAL) + _mesa_debug(NULL, " Material "); /* The order of these two is not easily knowable, but this is * the usually correct way to look at them. */ - if (req & flags[i] & VERT_END) - fprintf(stderr, " END "); + if (req & flags[i] & VERT_BIT_END) + _mesa_debug(NULL, " END "); - if (req & flags[i] & VERT_BEGIN) - fprintf(stderr, " BEGIN(%s) (%s%s%s%s)", + if (req & flags[i] & VERT_BIT_BEGIN) + _mesa_debug(NULL, " BEGIN(%s) (%s%s%s%s)", _mesa_prim_name[IM->Primitive[i] & PRIM_MODE_MASK], (IM->Primitive[i] & PRIM_LAST) ? "LAST," : "", (IM->Primitive[i] & PRIM_BEGIN) ? "BEGIN," : "", (IM->Primitive[i] & PRIM_END) ? "END," : "", (IM->Primitive[i] & PRIM_PARITY) ? "PARITY," : ""); - fprintf(stderr, "\n"); + _mesa_debug(NULL, "\n"); } }