r300g: More debug flags.

This commit is contained in:
Corbin Simpson 2009-10-12 21:26:46 -07:00
parent a4a4f7abc2
commit ca8cafda0b
3 changed files with 9 additions and 4 deletions

View File

@ -313,6 +313,8 @@ void r300_init_surface_functions(struct r300_context* r300);
#define DBG_CS 0x0000008 #define DBG_CS 0x0000008
#define DBG_DRAW 0x0000010 #define DBG_DRAW 0x0000010
#define DBG_SURF 0x0000020 #define DBG_SURF 0x0000020
#define DBG_TEX 0x0000040
#define DBG_FALL 0x0000080
/*@}*/ /*@}*/
static INLINE boolean DBG_ON(struct r300_context * ctx, unsigned flags) static INLINE boolean DBG_ON(struct r300_context * ctx, unsigned flags)

View File

@ -38,6 +38,8 @@ static struct debug_option debug_options[] = {
{ "cs", DBG_CS, "Command submissions" }, { "cs", DBG_CS, "Command submissions" },
{ "draw", DBG_DRAW, "Draw and emit" }, { "draw", DBG_DRAW, "Draw and emit" },
{ "surf", DBG_SURF, "Surface drawing" }, { "surf", DBG_SURF, "Surface drawing" },
{ "tex", DBG_TEX, "Textures" },
{ "fall", DBG_FALL, "Fallbacks" },
{ "all", ~0, "Convenience option that enables all debug flags" }, { "all", ~0, "Convenience option that enables all debug flags" },

View File

@ -116,7 +116,8 @@ static void r300_surface_fill(struct pipe_context* pipe,
if (!pipe->screen->is_format_supported(pipe->screen, dest->format, if (!pipe->screen->is_format_supported(pipe->screen, dest->format,
PIPE_TEXTURE_2D, PIPE_TEXTURE_USAGE_RENDER_TARGET, 0)) { PIPE_TEXTURE_2D, PIPE_TEXTURE_USAGE_RENDER_TARGET, 0)) {
fallback: fallback:
DBG(r300, DBG_SURF, "r300: Falling back on surface clear...\n"); DBG(r300, DBG_SURF | DBG_FALL,
"r300: Falling back on surface clear...\n");
util_surface_fill(pipe, dest, x, y, w, h, color); util_surface_fill(pipe, dest, x, y, w, h, color);
return; return;
} }
@ -131,7 +132,7 @@ validate:
if (!r300->winsys->validate(r300->winsys)) { if (!r300->winsys->validate(r300->winsys)) {
r300->context.flush(&r300->context, 0, NULL); r300->context.flush(&r300->context, 0, NULL);
if (invalid) { if (invalid) {
DBG(r300, DBG_SURF, "r300: Stuck in validation loop, gonna fallback."); DBG(r300, DBG_SURF | DBG_FALL, "r300: Stuck in validation loop.");
goto fallback; goto fallback;
} }
invalid = TRUE; invalid = TRUE;
@ -254,7 +255,7 @@ static void r300_surface_copy(struct pipe_context* pipe,
!pipe->screen->is_format_supported(pipe->screen, dest->format, !pipe->screen->is_format_supported(pipe->screen, dest->format,
PIPE_TEXTURE_2D, PIPE_TEXTURE_USAGE_RENDER_TARGET, 0)) { PIPE_TEXTURE_2D, PIPE_TEXTURE_USAGE_RENDER_TARGET, 0)) {
fallback: fallback:
DBG(r300, DBG_SURF, "r300: Falling back on surface_copy\n"); DBG(r300, DBG_SURF | DBG_FALL, "r300: Falling back on surface_copy\n");
util_surface_copy(pipe, FALSE, dest, destx, desty, src, util_surface_copy(pipe, FALSE, dest, destx, desty, src,
srcx, srcy, w, h); srcx, srcy, w, h);
return; return;
@ -275,7 +276,7 @@ validate:
if (!r300->winsys->validate(r300->winsys)) { if (!r300->winsys->validate(r300->winsys)) {
r300->context.flush(&r300->context, 0, NULL); r300->context.flush(&r300->context, 0, NULL);
if (invalid) { if (invalid) {
DBG(r300, DBG_SURF, "r300: Stuck in validation loop, gonna fallback."); DBG(r300, DBG_SURF | DBG_FALL, "r300: Stuck in validation loop.");
goto fallback; goto fallback;
} }
invalid = TRUE; invalid = TRUE;