diff options
Diffstat (limited to 'src/mesa/main/debug.c')
| -rw-r--r-- | src/mesa/main/debug.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c index 072d6e526c..83e3a8b86b 100644 --- a/src/mesa/main/debug.c +++ b/src/mesa/main/debug.c @@ -4,7 +4,7 @@ void gl_print_state( const char *msg, GLuint state ) { fprintf(stderr, - "%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%s%s\n", + "%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%s\n", msg, state, (state & _NEW_MODELVIEW) ? "ctx->ModelView, " : "", @@ -19,7 +19,6 @@ void gl_print_state( const char *msg, GLuint state ) (state & _NEW_HINT) ? "ctx->Hint, " : "", (state & _NEW_LIGHT) ? "ctx->Light, " : "", (state & _NEW_LINE) ? "ctx->Line, " : "", - (state & _NEW_FEEDBACK_SELECT) ? "ctx->Feedback/Select, " : "", (state & _NEW_PIXEL) ? "ctx->Pixel, " : "", (state & _NEW_POINT) ? "ctx->Point, " : "", (state & _NEW_POLYGON) ? "ctx->Polygon, " : "", @@ -39,11 +38,9 @@ void gl_print_state( const char *msg, GLuint state ) void gl_print_enable_flags( const char *msg, GLuint flags ) { fprintf(stderr, - "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", + "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", msg, flags, - (flags & ENABLE_TEX0) ? "tex-0, " : "", - (flags & ENABLE_TEX1) ? "tex-1, " : "", (flags & ENABLE_LIGHT) ? "light, " : "", (flags & ENABLE_FOG) ? "fog, " : "", (flags & ENABLE_USERCLIP) ? "userclip, " : "", @@ -51,10 +48,18 @@ void gl_print_enable_flags( const char *msg, GLuint flags ) (flags & ENABLE_TEXGEN1) ? "tex-gen-1, " : "", (flags & ENABLE_TEXGEN2) ? "tex-gen-2, " : "", (flags & ENABLE_TEXGEN3) ? "tex-gen-3, " : "", + (flags & ENABLE_TEXGEN4) ? "tex-gen-4, " : "", + (flags & ENABLE_TEXGEN5) ? "tex-gen-5, " : "", + (flags & ENABLE_TEXGEN6) ? "tex-gen-6, " : "", + (flags & ENABLE_TEXGEN7) ? "tex-gen-7, " : "", (flags & ENABLE_TEXMAT0) ? "tex-mat-0, " : "", (flags & ENABLE_TEXMAT1) ? "tex-mat-1, " : "", (flags & ENABLE_TEXMAT2) ? "tex-mat-2, " : "", (flags & ENABLE_TEXMAT3) ? "tex-mat-3, " : "", + (flags & ENABLE_TEXMAT4) ? "tex-mat-4, " : "", + (flags & ENABLE_TEXMAT5) ? "tex-mat-5, " : "", + (flags & ENABLE_TEXMAT6) ? "tex-mat-6, " : "", + (flags & ENABLE_TEXMAT7) ? "tex-mat-7, " : "", (flags & ENABLE_NORMALIZE) ? "normalize, " : "", (flags & ENABLE_RESCALE) ? "rescale, " : ""); } @@ -62,19 +67,17 @@ void gl_print_enable_flags( const char *msg, GLuint flags ) void gl_print_tri_caps( const char *name, GLuint flags ) { fprintf(stderr, - "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", + "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", name, flags, (flags & DD_FEEDBACK) ? "feedback, " : "", (flags & DD_SELECT) ? "select, " : "", (flags & DD_FLATSHADE) ? "flat-shade, " : "", - (flags & DD_MULTIDRAW) ? "multidraw, " : "", (flags & DD_SEPERATE_SPECULAR) ? "seperate-specular, " : "", (flags & DD_TRI_LIGHT_TWOSIDE) ? "tri-light-twoside, " : "", (flags & DD_TRI_UNFILLED) ? "tri-unfilled, " : "", (flags & DD_TRI_STIPPLE) ? "tri-stipple, " : "", (flags & DD_TRI_OFFSET) ? "tri-offset, " : "", - (flags & DD_TRI_CULL) ? "tri-bf-cull, " : "", (flags & DD_TRI_SMOOTH) ? "tri-smooth, " : "", (flags & DD_LINE_SMOOTH) ? "line-smooth, " : "", (flags & DD_LINE_STIPPLE) ? "line-stipple, " : "", @@ -82,7 +85,6 @@ void gl_print_tri_caps( const char *name, GLuint flags ) (flags & DD_POINT_SMOOTH) ? "point-smooth, " : "", (flags & DD_POINT_SIZE) ? "point-size, " : "", (flags & DD_POINT_ATTEN) ? "point-atten, " : "", - (flags & DD_LIGHTING_CULL) ? "lighting-cull, " : "", (flags & DD_TRI_CULL_FRONT_BACK) ? "cull-all, " : "", (flags & DD_STENCIL) ? "stencil, " : "" ); |