r300g: More debug flags.

diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index a817459ee3d3616277f30330ab0c148cdb82a285..086633f732dccfe1251cf31fbf90b852bea53c71 100644 (file)
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -313,6 +313,8 @@ void r300_init_surface_functions(struct r300_context* r300);
 #define DBG_CS      0x0000008
 #define DBG_DRAW    0x0000010
 #define DBG_SURF    0x0000020
+#define DBG_TEX     0x0000040
+#define DBG_FALL    0x0000080
 /*@}*/
 
 static INLINE boolean DBG_ON(struct r300_context * ctx, unsigned flags)

diff --git a/src/gallium/drivers/r300/r300_debug.c b/src/gallium/drivers/r300/r300_debug.c
index 4a55a0c5b1f6af568f5d51a9e0b70096f92db3a4..bfd4ab018a569239c3f3e36f87abe0a406bc8f3d 100644 (file)
--- a/src/gallium/drivers/r300/r300_debug.c
+++ b/src/gallium/drivers/r300/r300_debug.c
@@ -38,6 +38,8 @@ static struct debug_option debug_options[] = {
     { "cs", DBG_CS, "Command submissions" },
     { "draw", DBG_DRAW, "Draw and emit" },
     { "surf", DBG_SURF, "Surface drawing" },
+    { "tex", DBG_TEX, "Textures" },
+    { "fall", DBG_FALL, "Fallbacks" },
 
     { "all", ~0, "Convenience option that enables all debug flags" },
 

diff --git a/src/gallium/drivers/r300/r300_surface.c b/src/gallium/drivers/r300/r300_surface.c
index a263b265125f0065c6f8c8e74ba0b521e9aa3d5f..d72e734ff0c0fa724d2c6774e272cfe43a30d6a6 100644 (file)
--- a/src/gallium/drivers/r300/r300_surface.c
+++ b/src/gallium/drivers/r300/r300_surface.c
@@ -116,7 +116,8 @@ static void r300_surface_fill(struct pipe_context* pipe,
     if (!pipe->screen->is_format_supported(pipe->screen, dest->format,
         PIPE_TEXTURE_2D, PIPE_TEXTURE_USAGE_RENDER_TARGET, 0)) {
 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);
         return;
     }
@@ -131,7 +132,7 @@ validate:
     if (!r300->winsys->validate(r300->winsys)) {
         r300->context.flush(&r300->context, 0, NULL);
         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;
         }
         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_TEXTURE_2D, PIPE_TEXTURE_USAGE_RENDER_TARGET, 0)) {
 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,
                 srcx, srcy, w, h);
         return;
@@ -275,7 +276,7 @@ validate:
     if (!r300->winsys->validate(r300->winsys)) {
         r300->context.flush(&r300->context, 0, NULL);
         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;
         }
         invalid = TRUE;