r600g: Use the actual Evergreen functions to query format support on Evergreen.

[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 f21ebd02f55a30312614f35abba352a4d45deb42..7ed8ee608a80577b93fd7b55ee57f9b0d492a0ab 100644 (file)
--- a/src/gallium/auxiliary/util/u_debug_describe.c
+++ b/src/gallium/auxiliary/util/u_debug_describe.c
@@ -38,20 +38,30 @@ debug_describe_reference(char* buf, const struct pipe_reference*ptr)
 void
 debug_describe_resource(char* buf, const struct pipe_resource *ptr)
 {
-   if(ptr->target == PIPE_BUFFER)
+   switch(ptr->target)
+   {
+   case PIPE_BUFFER:
       util_sprintf(buf, "pipe_buffer<%u>", (unsigned)util_format_get_stride(ptr->format, ptr->width0));
-   else if(ptr->target == PIPE_TEXTURE_1D)
+      break;
+   case PIPE_TEXTURE_1D:
       util_sprintf(buf, "pipe_texture1d<%u,%s,%u>", ptr->width0, util_format_short_name(ptr->format), ptr->last_level);
-   else if(ptr->target == PIPE_TEXTURE_2D)
+      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);
-   else if(ptr->target == PIPE_TEXTURE_RECT)
+      break;
+   case PIPE_TEXTURE_RECT:
       util_sprintf(buf, "pipe_texture_rect<%u,%u,%s>", ptr->width0, ptr->height0, util_format_short_name(ptr->format));
-   else if(ptr->target == PIPE_TEXTURE_CUBE)
+      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);
-   else if(ptr->target == PIPE_TEXTURE_3D)
+      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);
-   else
+      break;
+   default:
       util_sprintf(buf, "pipe_martian_resource<%u>", ptr->target);
+      break;
+   }
 }
 
 void
@@ -59,7 +69,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->face, ptr->level, ptr->zslice);
+   util_sprintf(buf, "pipe_surface<%s,%u,%u,%u>", res, ptr->u.tex.level, ptr->u.tex.first_layer, ptr->u.tex.last_layer);
 }
 
 void