[Mesa-dev] [PATCH 1/8] intel: Rename INTEL_DEBUG=fall to INTEL_DEBUG=perf.

[Eric Anholt]

I want to introduce some more debug output for performance surprises that
includes fallbacks, but aren't necessarily software rasterization.  Leave
INTEL_DEBUG=fall in place for those that have used that flag before.
---
 src/mesa/drivers/dri/i915/i915_program.c    |    2 +-
 src/mesa/drivers/dri/i915/intel_tris.c      |    4 ++--
 src/mesa/drivers/dri/i965/brw_fallback.c    |    2 +-
 src/mesa/drivers/dri/i965/brw_urb.c         |    2 +-
 src/mesa/drivers/dri/intel/intel_context.c  |    3 ++-
 src/mesa/drivers/dri/intel/intel_context.h  |    4 ++--
 src/mesa/drivers/dri/intel/intel_tex_copy.c |    4 ++--
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/i915_program.c b/src/mesa/drivers/dri/i915/i915_program.c
index 0a600d3..4437167 100644
--- a/src/mesa/drivers/dri/i915/i915_program.c
+++ b/src/mesa/drivers/dri/i915/i915_program.c
@@ -442,7 +442,7 @@ i915_emit_param4fv(struct i915_fragment_program * p, const GLfloat * values)
 void
 i915_program_error(struct i915_fragment_program *p, const char *fmt, ...)
 {
-   if (unlikely((INTEL_DEBUG & (DEBUG_WM | DEBUG_FALLBACKS)) != 0)) {
+   if (unlikely((INTEL_DEBUG & (DEBUG_WM | DEBUG_PERF)) != 0)) {
       va_list args;
 
       fprintf(stderr, "i915_program_error: ");
diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c
index 5954b24..549af5e 100644
--- a/src/mesa/drivers/dri/i915/intel_tris.c
+++ b/src/mesa/drivers/dri/i915/intel_tris.c
@@ -1223,7 +1223,7 @@ intelFallback(struct intel_context *intel, GLbitfield bit, bool mode)
 	 assert(!intel->tnl_pipeline_running);
 
          intel_flush(ctx);
-         if (INTEL_DEBUG & DEBUG_FALLBACKS)
+         if (INTEL_DEBUG & DEBUG_PERF)
             fprintf(stderr, "ENTER FALLBACK %x: %s\n",
                     bit, getFallbackString(bit));
          _swsetup_Wakeup(ctx);
@@ -1236,7 +1236,7 @@ intelFallback(struct intel_context *intel, GLbitfield bit, bool mode)
 	 assert(!intel->tnl_pipeline_running);
 
          _swrast_flush(ctx);
-         if (INTEL_DEBUG & DEBUG_FALLBACKS)
+         if (INTEL_DEBUG & DEBUG_PERF)
             fprintf(stderr, "LEAVE FALLBACK %s\n", getFallbackString(bit));
          tnl->Driver.Render.Start = intelRenderStart;
          tnl->Driver.Render.PrimitiveNotify = intelRenderPrimitive;
diff --git a/src/mesa/drivers/dri/i965/brw_fallback.c b/src/mesa/drivers/dri/i965/brw_fallback.c
index 81fc23a..1ae6fc8 100644
--- a/src/mesa/drivers/dri/i965/brw_fallback.c
+++ b/src/mesa/drivers/dri/i965/brw_fallback.c
@@ -37,7 +37,7 @@
 #include "tnl/tnl.h"
 #include "brw_context.h"
 
-#define FILE_DEBUG_FLAG DEBUG_FALLBACKS
+#define FILE_DEBUG_FLAG DEBUG_PERF
 
 static bool do_check_fallback(struct brw_context *brw)
 {
diff --git a/src/mesa/drivers/dri/i965/brw_urb.c b/src/mesa/drivers/dri/i965/brw_urb.c
index 7643dc2..b1126b5 100644
--- a/src/mesa/drivers/dri/i965/brw_urb.c
+++ b/src/mesa/drivers/dri/i965/brw_urb.c
@@ -190,7 +190,7 @@ static void recalculate_urb_fence( struct brw_context *brw )
 	    exit(1);
 	 }
 	 
-	 if (unlikely(INTEL_DEBUG & (DEBUG_URB|DEBUG_FALLBACKS)))
+	 if (unlikely(INTEL_DEBUG & (DEBUG_URB|DEBUG_PERF)))
 	    printf("URB CONSTRAINED\n");
       }
 
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 759fead..a39462b 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -427,7 +427,8 @@ static const struct dri_debug_control debug_control[] = {
    { "ioctl", DEBUG_IOCTL},
    { "blit",  DEBUG_BLIT},
    { "mip",   DEBUG_MIPTREE},
-   { "fall",  DEBUG_FALLBACKS},
+   { "fall",  DEBUG_PERF},
+   { "perf",  DEBUG_PERF},
    { "verb",  DEBUG_VERBOSE},
    { "bat",   DEBUG_BATCH},
    { "pix",   DEBUG_PIXEL},
diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h
index 29ab187..6d1a81c 100644
--- a/src/mesa/drivers/dri/intel/intel_context.h
+++ b/src/mesa/drivers/dri/intel/intel_context.h
@@ -430,7 +430,7 @@ extern int INTEL_DEBUG;
 #define DEBUG_IOCTL	0x4
 #define DEBUG_BLIT	0x8
 #define DEBUG_MIPTREE   0x10
-#define DEBUG_FALLBACKS	0x20
+#define DEBUG_PERF	0x20
 #define DEBUG_VERBOSE	0x40
 #define DEBUG_BATCH     0x80
 #define DEBUG_PIXEL     0x100
@@ -459,7 +459,7 @@ extern int INTEL_DEBUG;
 } while(0)
 
 #define fallback_debug(...) do {				\
-	if (unlikely(INTEL_DEBUG & DEBUG_FALLBACKS))		\
+	if (unlikely(INTEL_DEBUG & DEBUG_PERF))			\
 		printf(__VA_ARGS__);				\
 } while(0)
 
diff --git a/src/mesa/drivers/dri/intel/intel_tex_copy.c b/src/mesa/drivers/dri/intel/intel_tex_copy.c
index 6da4ec6..f436633 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_copy.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_copy.c
@@ -61,7 +61,7 @@ intel_copy_texsubimage(struct intel_context *intel,
    intel_prepare_render(intel);
 
    if (!intelImage->mt || !irb || !irb->mt) {
-      if (unlikely(INTEL_DEBUG & DEBUG_FALLBACKS))
+      if (unlikely(INTEL_DEBUG & DEBUG_PERF))
 	 fprintf(stderr, "%s fail %p %p (0x%08x)\n",
 		 __FUNCTION__, intelImage->mt, irb, internalFormat);
       return false;
@@ -85,7 +85,7 @@ intel_copy_texsubimage(struct intel_context *intel,
    }
 
    if (!copy_supported && !copy_supported_with_alpha_override) {
-      if (unlikely(INTEL_DEBUG & DEBUG_FALLBACKS))
+      if (unlikely(INTEL_DEBUG & DEBUG_PERF))
 	 fprintf(stderr, "%s mismatched formats %s, %s\n",
 		 __FUNCTION__,
 		 _mesa_get_format_name(intelImage->base.Base.TexFormat),
-- 
1.7.10.4