freedreno/layout: layout simplifications and pitch from level 0 pitch

[mesa.git] / src / gallium / auxiliary / util / u_debug_describe.c

diff --git a/src/gallium/auxiliary/util/u_debug_describe.c b/src/gallium/auxiliary/util/u_debug_describe.c
index df73ed83ef612b52b6b48bc037d6c1959969478d..8bfd970a508411660767ca3dd098e7012e3a9dd0 100644 (file)
--- a/src/gallium/auxiliary/util/u_debug_describe.c
+++ b/src/gallium/auxiliary/util/u_debug_describe.c
@@ -25,12 +25,12 @@
  **************************************************************************/
 
 #include "pipe/p_state.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_debug_describe.h"
 #include "util/u_string.h"
 
 void
-debug_describe_reference(char* buf, const struct pipe_reference*ptr)
+debug_describe_reference(char* buf, UNUSED const struct pipe_reference*ptr)
 {
    strcpy(buf, "pipe_object");
 }
@@ -41,25 +41,34 @@ debug_describe_resource(char* buf, const struct pipe_resource *ptr)
    switch(ptr->target)
    {
    case PIPE_BUFFER:
-      util_sprintf(buf, "pipe_buffer<%u>", (unsigned)util_format_get_stride(ptr->format, ptr->width0));
+      sprintf(buf, "pipe_buffer<%u>", (unsigned)util_format_get_stride(ptr->format, ptr->width0));
       break;
    case PIPE_TEXTURE_1D:
-      util_sprintf(buf, "pipe_texture1d<%u,%s,%u>", ptr->width0, util_format_short_name(ptr->format), ptr->last_level);
+      sprintf(buf, "pipe_texture1d<%u,%s,%u>", ptr->width0, util_format_short_name(ptr->format), ptr->last_level);
       break;
    case PIPE_TEXTURE_2D:
-      util_sprintf(buf, "pipe_texture2d<%u,%u,%s,%u>", ptr->width0, ptr->height0, util_format_short_name(ptr->format), ptr->last_level);
+      sprintf(buf, "pipe_texture2d<%u,%u,%s,%u>", ptr->width0, ptr->height0, util_format_short_name(ptr->format), ptr->last_level);
       break;
    case PIPE_TEXTURE_RECT:
-      util_sprintf(buf, "pipe_texture_rect<%u,%u,%s>", ptr->width0, ptr->height0, util_format_short_name(ptr->format));
+      sprintf(buf, "pipe_texture_rect<%u,%u,%s>", ptr->width0, ptr->height0, util_format_short_name(ptr->format));
       break;
    case PIPE_TEXTURE_CUBE:
-      util_sprintf(buf, "pipe_texture_cube<%u,%u,%s,%u>", ptr->width0, ptr->height0, util_format_short_name(ptr->format), ptr->last_level);
+      sprintf(buf, "pipe_texture_cube<%u,%u,%s,%u>", ptr->width0, ptr->height0, util_format_short_name(ptr->format), ptr->last_level);
       break;
    case PIPE_TEXTURE_3D:
-      util_sprintf(buf, "pipe_texture3d<%u,%u,%u,%s,%u>", ptr->width0, ptr->height0, ptr->depth0, util_format_short_name(ptr->format), ptr->last_level);
+      sprintf(buf, "pipe_texture3d<%u,%u,%u,%s,%u>", ptr->width0, ptr->height0, ptr->depth0, util_format_short_name(ptr->format), ptr->last_level);
+      break;
+   case PIPE_TEXTURE_1D_ARRAY:
+      sprintf(buf, "pipe_texture_1darray<%u,%u,%s,%u>", ptr->width0, ptr->array_size, util_format_short_name(ptr->format), ptr->last_level);
+      break;
+   case PIPE_TEXTURE_2D_ARRAY:
+      sprintf(buf, "pipe_texture_2darray<%u,%u,%u,%s,%u>", ptr->width0, ptr->height0, ptr->array_size, util_format_short_name(ptr->format), ptr->last_level);
+      break;
+   case PIPE_TEXTURE_CUBE_ARRAY:
+      sprintf(buf, "pipe_texture_cubearray<%u,%u,%u,%s,%u>", ptr->width0, ptr->height0, ptr->array_size, util_format_short_name(ptr->format), ptr->last_level);
       break;
    default:
-      util_sprintf(buf, "pipe_martian_resource<%u>", ptr->target);
+      sprintf(buf, "pipe_martian_resource<%u>", ptr->target);
       break;
    }
 }
@@ -69,7 +78,7 @@ debug_describe_surface(char* buf, const struct pipe_surface *ptr)
 {
    char res[128];
    debug_describe_resource(res, ptr->texture);
-   util_sprintf(buf, "pipe_surface<%s,%u,%u,%u>", res, ptr->u.tex.level, ptr->u.tex.first_layer, ptr->u.tex.last_layer);
+   sprintf(buf, "pipe_surface<%s,%u,%u,%u>", res, ptr->u.tex.level, ptr->u.tex.first_layer, ptr->u.tex.last_layer);
 }
 
 void
@@ -77,7 +86,16 @@ debug_describe_sampler_view(char* buf, const struct pipe_sampler_view *ptr)
 {
    char res[128];
    debug_describe_resource(res, ptr->texture);
-   util_sprintf(buf, "pipe_sampler_view<%s,%s>", res, util_format_short_name(ptr->format));
+   sprintf(buf, "pipe_sampler_view<%s,%s>", res, util_format_short_name(ptr->format));
+}
+
+void
+debug_describe_image_view(char* buf, const struct pipe_image_view *ptr)
+{
+   char res[128];
+   debug_describe_resource(res, ptr->resource);
+   sprintf(buf, "pipe_image_view<%s,%s>", res,
+                util_format_short_name(ptr->format));
 }
 
 void
@@ -86,6 +104,6 @@ debug_describe_so_target(char* buf,
 {
    char res[128];
    debug_describe_resource(res, ptr->buffer);
-   util_sprintf(buf, "pipe_stream_output_target<%s,%u,%u>", res,
+   sprintf(buf, "pipe_stream_output_target<%s,%u,%u>", res,
                 ptr->buffer_offset, ptr->buffer_size);
 }