Mesa (main): freedreno/fdl: Give the tiling mode a nice name in debug dumps.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 8effbeeea6f7b2de29bc9e9a85dc96fe15adf51c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8effbeeea6f7b2de29bc9e9a85dc96fe15adf51c

Author: Emma Anholt <emma at anholt.net>
Date:   Thu Jun 17 12:57:31 2021 -0700

freedreno/fdl: Give the tiling mode a nice name in debug dumps.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11452>

---

 src/freedreno/fdl/freedreno_layout.c | 15 +++++++++++++--
 src/freedreno/fdl/freedreno_layout.h |  2 ++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/freedreno/fdl/freedreno_layout.c b/src/freedreno/fdl/freedreno_layout.c
index a334288010c..803ef2463b0 100644
--- a/src/freedreno/fdl/freedreno_layout.c
+++ b/src/freedreno/fdl/freedreno_layout.c
@@ -42,6 +42,17 @@ fdl_layout_buffer(struct fdl_layout *layout, uint32_t size)
    layout->nr_samples = 1;
 }
 
+const char *
+fdl_tile_mode_desc(const struct fdl_layout *layout, int level)
+{
+   if (fdl_ubwc_enabled(layout, level))
+      return "UBWC";
+   else if (fdl_tile_mode(layout, level) == 0) /* TILE6_LINEAR and friends */
+      return "linear";
+   else
+      return "tiled";
+}
+
 void
 fdl_dump_layout(struct fdl_layout *layout)
 {
@@ -54,13 +65,13 @@ fdl_dump_layout(struct fdl_layout *layout)
       fprintf(
          stderr,
          "%s: %ux%ux%u@%ux%u:\t%2u: stride=%4u, size=%6u,%6u, "
-         "aligned_height=%3u, offset=0x%x,0x%x, layersz %5u,%5u tiling=%d\n",
+         "aligned_height=%3u, offset=0x%x,0x%x, layersz %5u,%5u %s\n",
          util_format_name(layout->format), u_minify(layout->width0, level),
          u_minify(layout->height0, level), u_minify(layout->depth0, level),
          layout->cpp, layout->nr_samples, level, fdl_pitch(layout, level),
          slice->size0, ubwc_slice->size0,
          slice->size0 / fdl_pitch(layout, level), slice->offset,
          ubwc_slice->offset, layout->layer_size, layout->ubwc_layer_size,
-         fdl_tile_mode(layout, level));
+         fdl_tile_mode_desc(layout, level));
    }
 }
diff --git a/src/freedreno/fdl/freedreno_layout.h b/src/freedreno/fdl/freedreno_layout.h
index e25b7800de9..a2c81227f7f 100644
--- a/src/freedreno/fdl/freedreno_layout.h
+++ b/src/freedreno/fdl/freedreno_layout.h
@@ -228,6 +228,8 @@ fdl_ubwc_enabled(const struct fdl_layout *layout, int level)
    return layout->ubwc;
 }
 
+const char *fdl_tile_mode_desc(const struct fdl_layout *layout, int level);
+
 void fdl_layout_buffer(struct fdl_layout *layout, uint32_t size);
 
 void fdl5_layout(struct fdl_layout *layout, enum pipe_format format,