Code housekeeping.

6 files changed, 34 insertions, 90 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_blorp.cpp b/src/mesa/drivers/dri/i965/brw_blorp.cpp
index d99dd74fe1..65c559801c 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp.cpp
@@ -101,14 +101,14 @@ brw_blorp_surface_info::set(struct brw_context *brw,
       /* set up for a render target */
       this->brw_surfaceformat = format_info->brw_render_shadow_format;
 
-      _mesa_debug(&brw->ctx, "%s. Using render format: 0x%x for: %s\n",
-                  __FUNCTION__, this->brw_surfaceformat, _mesa_get_format_name(mt->format));
+      DGB("%s. Using render format: 0x%x for: %s\n",
+          __FUNCTION__, this->brw_surfaceformat, _mesa_get_format_name(mt->format));
    } else {
       /* set up for a sample target */
       this->brw_surfaceformat = format_info->brw_sample_shadow_format;
 
-      _mesa_debug(&brw->ctx, "%s. Using sample format: 0x%x for: %s\n",
-                  __FUNCTION__, this->brw_surfaceformat, _mesa_get_format_name(mt->format));
+      DGB("%s. Using sample format: 0x%x for: %s\n",
+          __FUNCTION__, this->brw_surfaceformat, _mesa_get_format_name(mt->format));
    }
 
 #if 0
diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
index 97fd5f83a8..c5b2644651 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
@@ -339,7 +339,7 @@ brw_blorp_GPUcopytexsubimage(struct brw_context *brw,
        dst_image->Height == 0 ||
        dst_image->Width == 0 ||
        dst_image->Depth == 0) {
-      _mesa_debug(&brw->ctx, "%s: unsupported parameter\n", __FUNCTION__);
+      DGB("%s: unsupported parameter\n", __FUNCTION__);
       return false;
    }
 
@@ -358,24 +358,24 @@ brw_blorp_GPUcopytexsubimage(struct brw_context *brw,
    }
 
    if (dst_image->Width % 16) {
-      _mesa_debug(&brw->ctx, "%s: Blorp Path currently requires texture widths to be on 16 pixel boundry.\n", __FUNCTION__);
+      perf_debug("%s: Blorp Path currently requires texture widths to be on 16 pixel boundry.\n", __FUNCTION__);
       return false;
    }
 
     if (0 != srcX0 || 0 != srcY0 || 0 != dstX0 || 0 != dstY0) {
-       _mesa_debug(&brw->ctx, "%s: Sub image loads not currently supported\n", __FUNCTION__);
+       perf_debug("%s: Sub image loads not currently supported\n", __FUNCTION__);
        return false;
     }
 
     if (0 != dst_image->Level) {
-       _mesa_debug(&brw->ctx, "%s: Non-base levels not currently supported\n", __FUNCTION__);
+       perf_debug("%s: Non-base levels not currently supported\n", __FUNCTION__);
        return false;
     }
 
     /* Come up with a match to the source format for the texture cache */
     gl_format cacheTexFormat = _mesa_choose_cached_tex_format(&brw->ctx, format, type);
 
-    _mesa_debug(&brw->ctx, "%s: Cache Texture Format: %s, Target Format: %s, Internal Format: %s"
+    DGB("%s: Cache Texture Format: %s, Target Format: %s, Internal Format: %s"
                 " Packing Alignment: %d\n",
                 __FUNCTION__, _mesa_get_format_name(cacheTexFormat), _mesa_get_format_name(dst_image->TexFormat),
                 _mesa_lookup_enum_by_nr(dst_image->InternalFormat), packing->Alignment);
@@ -386,7 +386,7 @@ brw_blorp_GPUcopytexsubimage(struct brw_context *brw,
     }
 
     if (packing->Alignment > _mesa_get_format_bytes(cacheTexFormat)) {
-       _mesa_debug(&brw->ctx, "%s: Alignment exceeds pixel size, which is not yet supported.\n", __FUNCTION__);
+       perf_debug("%s: Alignment exceeds pixel size, which is not yet supported.\n", __FUNCTION__);
        return false;
     }
 
@@ -416,10 +416,10 @@ brw_blorp_GPUcopytexsubimage(struct brw_context *brw,
     case GL_TEXTURE_2D_ARRAY:
     case GL_TEXTURE_3D:
     case GL_TEXTURE_CUBE_MAP_ARRAY:
-       _mesa_debug(&brw->ctx, "Target 0x%x not supported()", dst_image->TexObject->Target);
+       perf_debug("Target 0x%x not supported()", dst_image->TexObject->Target);
        return false;
     default:
-       _mesa_debug(&brw->ctx, "Unexpected target 0x%x in %s", dst_image->TexObject->Target, __FUNCTION__);
+       DGB("Unexpected target 0x%x in %s", dst_image->TexObject->Target, __FUNCTION__);
     }
 
     const int srcY1 = srcY0 + height;
@@ -433,7 +433,7 @@ brw_blorp_GPUcopytexsubimage(struct brw_context *brw,
                                          srcX0, srcY0, srcX1, srcY1,
                                          dstX0, dstY0, dstX1, dstY1,
                                          GL_NEAREST, false, false)) {
-       _mesa_debug(&brw->ctx, "brw_blorp_blit_miptrees failed.\n");
+       perf_debug("brw_blorp_blit_miptrees failed.\n");
        intel_miptree_release(&src_mt);
        return false;
     }
@@ -2357,7 +2357,7 @@ brw_blorp_blit_params::compare_source_to_target(struct brw_context *brw,
    }
 
    if (!testPassed) {
-      _mesa_debug(&brw->ctx, "%s: Target format %s doesn't match cached base: %s\n",
+      perf_debug("%s: Target format %s doesn't match cached base: %s\n",
                   __FUNCTION__, _mesa_lookup_enum_by_nr(baseDestinationFormat), _mesa_lookup_enum_by_nr(baseSourceFormat));
    }
    return testPassed;
@@ -2377,13 +2377,13 @@ brw_blorp_blit_params::test_formats(struct brw_context *brw,
       return false;
 
    if (MESA_FORMAT_NONE == src_format || MESA_FORMAT_COUNT <= src_format) {
-      _mesa_debug(ctx, "%s: Blorp doesn't yet support provided source format: %s\n",
+      perf_debug("%s: Blorp doesn't yet support provided source format: %s\n",
                   __FUNCTION__, _mesa_get_format_name(src_format));
       return false;
    }
 
    if (MESA_FORMAT_NONE == dst_format || MESA_FORMAT_COUNT <= dst_format) {
-      _mesa_debug(ctx, "%s: Blorp doesn't yet support provided destination format: %s\n",
+      perf_debug("%s: Blorp doesn't yet support provided destination format: %s\n",
                   __FUNCTION__, _mesa_get_format_name(dst_format));
       return false;
    }
@@ -2393,7 +2393,7 @@ brw_blorp_blit_params::test_formats(struct brw_context *brw,
     * brw_blorp_surface_info::set().
     */
    if ((src_format == MESA_FORMAT_X8_Z24) != (dst_format == MESA_FORMAT_X8_Z24)) {
-      _mesa_debug(ctx, "%s: Blorp requires source and destination to match for MESA_FORMAT_X8_Z24.\n", __FUNCTION__);
+      perf_debug("%s: Blorp requires source and destination to match for MESA_FORMAT_X8_Z24.\n", __FUNCTION__);
       return false;
    }
 
@@ -2402,13 +2402,13 @@ brw_blorp_blit_params::test_formats(struct brw_context *brw,
    const struct format_translator *src_format_info =
          translate_tex_format(brw, src_format, sRGB_en);
    if (src_format_info->process_flags & sample_not_supported_mask) {
-      _mesa_debug(ctx, "%s: compatible brw_surface format not found for source "
+      perf_debug("%s: compatible brw_surface format not found for source "
                  "texture mip tree. Source: %s\n",
                  __FUNCTION__, _mesa_get_format_name(src_format));
       return false;
    }
    if (!brw_format_for_sampling(brw, src_format_info->brw_sample_shadow_format)) {
-      _mesa_debug(ctx, "%s: The translated source miptree format is not supported for sampling: %s: 0x%x.\n",
+      perf_debug("%s: The translated source miptree format is not supported for sampling: %s: 0x%x.\n",
                  __FUNCTION__, _mesa_get_format_name(src_format), src_format_info->brw_sample_shadow_format);
       return false;
    }
@@ -2417,7 +2417,7 @@ brw_blorp_blit_params::test_formats(struct brw_context *brw,
          translate_tex_format(brw, dst_format, sRGB_en);
    if (!brw_format_for_render(brw, dst_format_info->brw_render_shadow_format) ||
        (dst_format_info->process_flags & render_not_supported_mask)) {
-      _mesa_debug(ctx, "%s: The translated target miptree format is not supported as a render target: %s: 0x%x.\n",
+      perf_debug("%s: The translated target miptree format is not supported as a render target: %s: 0x%x.\n",
                  __FUNCTION__, _mesa_get_format_name(dst_format), dst_format_info->brw_render_shadow_format);
       return false;
    }
@@ -2425,7 +2425,7 @@ brw_blorp_blit_params::test_formats(struct brw_context *brw,
    const bool raw_dst = raw_sample & dst_format_info->process_flags;
    const bool raw_src = raw_sample & src_format_info->process_flags;
    if (raw_dst != raw_src) {
-      _mesa_debug(ctx, "%s: Blorp doesn't yet convert from or to BRW raw formats"
+      perf_debug("%s: Blorp doesn't yet convert from or to BRW raw formats"
                   " dst: %s: src: %s.\n",
                  __FUNCTION__, _mesa_get_format_name(dst_format),
                   _mesa_get_format_name(src_format));
@@ -2448,7 +2448,7 @@ brw_blorp_blit_params::test_formats(struct brw_context *brw,
    const GLint internal_format_bits = _mesa_get_internalformat_bits(internal_format);
    if (internal_format_bits < (_mesa_get_format_bytes(dst_format) * 8) &&
        internal_format_bits > (_mesa_get_format_bytes(src_format) * 8)) {
-      _mesa_debug(ctx, "%s: The internal format: %s, %d - is smaller then target format %s, and larger "
+      perf_debug("%s: The internal format: %s, %d - is smaller then target format %s, and larger "
                   "than the source: %s\n",
                   __FUNCTION__, _mesa_lookup_enum_by_nr(internal_format),
                   internal_format_bits, _mesa_get_format_name(dst_format),
@@ -2501,7 +2501,7 @@ brw_blorp_blit_params::brw_blorp_blit_params(struct brw_context *brw,
 
       dst.brw_surfaceformat = format_info->brw_render_shadow_format;
       src.brw_surfaceformat = format_info->brw_sample_shadow_format;
-      _mesa_debug(&brw->ctx, "%s doing blt in sRGB format: %s from 0x%x to 0x%x\n",
+      perf_debug("%s doing blt in sRGB format: %s from 0x%x to 0x%x\n",
                   __FUNCTION__, _mesa_get_format_name(dst_mt->format),
                   src.brw_surfaceformat, dst.brw_surfaceformat);
    }
@@ -2545,7 +2545,7 @@ brw_blorp_blit_params::brw_blorp_blit_params(struct brw_context *brw,
       wm_prog_key.src_texture_data_type = BRW_REGISTER_TYPE_D;
       break;
    default:
-      _mesa_debug(&brw->ctx, "Unrecognized blorp format\n");
+      DGB("Unrecognized blorp format\n");
       break;
    }
 
@@ -2567,7 +2567,7 @@ brw_blorp_blit_params::brw_blorp_blit_params(struct brw_context *brw,
       wm_prog_key.dst_texture_data_type = BRW_REGISTER_TYPE_D;
       break;
    default:
-      _mesa_debug(&brw->ctx, "Unrecognized blorp format\n");
+      DGB("Unrecognized blorp format\n");
       break;
    }
 
diff --git a/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp b/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp
index 5ec769bcfe..f05a984d0e 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp_clear.cpp
@@ -194,10 +194,6 @@ brw_blorp_clear_params::brw_blorp_clear_params(struct brw_context *brw,
 
    /* Override the surface format according to the context's sRGB rules. */
    gl_format format = _mesa_get_render_format(ctx, irb->mt->format);
-//   blorp_process_format process_format_flags;
-//   brw_format_for_mesa_format(format, &process_format_flags, &dst.brw_surfaceformat, 0);
-//   _mesa_debug(&brw->ctx, "%s: using render format: 0x%x for %s\n",
-//               __FUNCTION__, dst.brw_surfaceformat, _mesa_get_format_name(format));
 
    x0 = fb->_Xmin;
    x1 = fb->_Xmax;
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index 1c3d81168e..69001e510d 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -290,9 +290,9 @@ brw_update_texture_surface(struct gl_context *ctx,
                               mt->format,
                               sampler->sRGBDecode);
 
-   _mesa_debug(&brw->ctx, "%s: using render format: 0x%x for %s\n",
-               __FUNCTION__, format_info->brw_sample_shadow_format,
-               _mesa_get_format_name(mt->format));
+   DBG("%s: using render format: 0x%x for %s\n",
+       __FUNCTION__, format_info->brw_sample_shadow_format,
+       _mesa_get_format_name(mt->format));
 
    surf[0] = (translate_tex_target(tObj->Target) << BRW_SURFACE_TYPE_SHIFT |
               BRW_SURFACE_MIPMAPLAYOUT_BELOW << BRW_SURFACE_MIPLAYOUT_SHIFT |
diff --git a/src/mesa/drivers/dri/i965/gen6_blorp.cpp b/src/mesa/drivers/dri/i965/gen6_blorp.cpp
index f09a4a1551..a4dee6f9dd 100644
--- a/src/mesa/drivers/dri/i965/gen6_blorp.cpp
+++ b/src/mesa/drivers/dri/i965/gen6_blorp.cpp
@@ -273,7 +273,7 @@ gen6_blorp_emit_blend_state(struct brw_context *brw,
       blend->blend0.ia_source_blend_factor = BRW_BLENDFACTOR_ONE;
       blend->blend0.ia_dest_blend_factor = BRW_BLENDFACTOR_ZERO;
 
-      _mesa_debug(&brw->ctx, "%s forcing Alpha to 1.0\n", __FUNCTION__);
+      DBG("%s forcing Alpha to 1.0\n", __FUNCTION__);
    }
 
    return cc_blend_state_offset;
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index 5a49c16e60..0c04216aa6 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -745,47 +745,9 @@ static int
 CopyClientBuffer(struct brw_context *brw, drm_intel_bo *intelBO,
                  unsigned offset, size_t len, const void *from)
 {
-    static unsigned totalCount = 0;
-    static unsigned bailCount = 0;
-    static unsigned memcpyCount = 0;
-
-    totalCount++;
-    static double dmaBytes = 0.0;
-    static double dmaTime = 0.0;
-    static double mapTime = 0.0;
-    static double mapBytes = 0.0;
-    static double memcpyBytes = 0.0;
-    static double memcpyTime = 0.0;
-    static double se4cpyBytes = 0.0;
-    static double se4cpyTime = 0.0;
-
-    enum {
-        testmemcpy = 0,
-        testSSE4Memcpy = 1,
-        testBOSubdata = 0
-    };
-
-//    if (0 == totalCount % 16) {
-//        _mesa_debug(&brw->ctx, "TotalCount: %d. DMA sec/byte: %g. Memcpy sec/byte: %g. SE4cpy sec/byte: %g.\n",
-//                    totalCount, dmaTime / dmaBytes, memcpyTime / memcpyBytes, se4cpyTime / se4cpyBytes);
-//    }
-
-
-    struct timespec timestruct;
-    clock_gettime(CLOCK_MONOTONIC, &timestruct);
-    const double time0 = timestruct.tv_sec + timestruct.tv_nsec / 1000000000.0;
-
     drm_intel_bo_map(intelBO, true);
-    clock_gettime(CLOCK_MONOTONIC, &timestruct);
-    double time1 = timestruct.tv_sec + timestruct.tv_nsec / 1000000000.0;
-
-    mapTime += time1 - time0;
-    mapBytes += len;
-//    _mesa_debug(&brw->ctx, "texture size: %d. Maptime bytes/sec: %g\n",
-//                len, len / (time1 - time0));
-
     if (!intelBO->virtual) {
-        _mesa_debug(&brw->ctx, "%s: Mapping Failed\n", __FUNCTION__);
+        DBG("%s: Mapping Failed\n", __FUNCTION__);
         return 0;
     }
 
@@ -793,28 +755,12 @@ CopyClientBuffer(struct brw_context *brw, drm_intel_bo *intelBO,
 
 #ifdef __SSE4_1__
     _mesa_streaming_load_memcpy(targetHead, from, len);
-    clock_gettime(CLOCK_MONOTONIC, &timestruct);
-    time1 = timestruct.tv_sec + timestruct.tv_nsec / 1000000000.0;
-
-    memcpyTime += time1 - time0;
-    memcpyBytes += len;
-    _mesa_debug(&brw->ctx, "texture size: %d. SSE4.1 Memcpy byte/sec: %g.\n",
-                len, len / (time1 - time0));
 
     return len;
 #else
 
-    bailCount++;
     memcpy(targetHead, from, len);
     drm_intel_bo_unmap(intelBO);
-    clock_gettime(CLOCK_MONOTONIC, &timestruct);
-    time1 = timestruct.tv_sec + timestruct.tv_nsec / 1000000000.0;
-
-    memcpyTime += time1 - time0;
-    memcpyBytes += len;
-    _mesa_debug(&brw->ctx, "texture size: %d. Memcpy byte/sec: %g.\n",
-                (unsigned)len, len / (time1 - time0));
-
     return len;
 #endif
 }
@@ -834,7 +780,7 @@ intel_miptree_create_for_client_texture_DMA(struct brw_context *brw,
     const GLint bytesPerRow = _mesa_image_row_stride(unpack, width, src_format, type);
 
     if (0 >= bytesPerRow) {
-        _mesa_debug(&brw->ctx, "%s Error, unrecognized format: 0x%x or type: 0x%x Failed\n", __FUNCTION__, src_format, type);
+        DGB("%s Error, unrecognized format: 0x%x or type: 0x%x Failed\n", __FUNCTION__, src_format, type);
         return false;
     }
 
@@ -881,7 +827,9 @@ intel_miptree_create_for_client_texture_DMA(struct brw_context *brw,
     mt->region = region;
 
     return mt;
-}/**
+}
+
+/**
  * For a singlesample image buffer, this simply wraps the given region with a miptree.
  *
  * For a multisample image buffer, this wraps the given region with