gallium/util: switch over to new u_debug_image.[ch] code

Reviewed-by: Marek Olšák <[email protected]>

10 files changed, 10 insertions, 353 deletions

diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 6f50f714c3f..84da85c5b96 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -191,11 +191,13 @@ C_SOURCES := \
 	util/u_cpu_detect.c \
 	util/u_cpu_detect.h \
 	util/u_debug.c \
+	util/u_debug.h \
 	util/u_debug_describe.c \
 	util/u_debug_describe.h \
 	util/u_debug_flush.c \
 	util/u_debug_flush.h \
-	util/u_debug.h \
+	util/u_debug_image.c \
+	util/u_debug_image.h \
 	util/u_debug_memory.c \
 	util/u_debug_refcnt.c \
 	util/u_debug_refcnt.h \
diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/gallium/auxiliary/util/u_debug.c
index 7a3d51f12c1..db6635713e5 100644
--- a/src/gallium/auxiliary/util/u_debug.c
+++ b/src/gallium/auxiliary/util/u_debug.c
@@ -38,9 +38,7 @@
 #include "util/u_memory.h"
 #include "util/u_string.h"
 #include "util/u_math.h"
-#include "util/u_tile.h"
 #include "util/u_prim.h"
-#include "util/u_surface.h"
 #include <inttypes.h>
 
 #include <stdio.h>
@@ -490,315 +488,6 @@ debug_funclog_enter_exit(const char* f, const int line, const char* file)
 
 #ifdef DEBUG
 /**
- * Dump an image to .ppm file.
- * \param format  PIPE_FORMAT_x
- * \param cpp  bytes per pixel
- * \param width  width in pixels
- * \param height height in pixels
- * \param stride  row stride in bytes
- */
-void
-debug_dump_image(const char *prefix,
-                 enum pipe_format format, unsigned cpp,
-                 unsigned width, unsigned height,
-                 unsigned stride,
-                 const void *data)
-{
-   /* write a ppm file */
-   char filename[256];
-   unsigned char *rgb8;
-   FILE *f;
-
-   util_snprintf(filename, sizeof(filename), "%s.ppm", prefix);
-
-   rgb8 = MALLOC(height * width * 3);
-   if (!rgb8) {
-      return;
-   }
-
-   util_format_translate(
-         PIPE_FORMAT_R8G8B8_UNORM,
-         rgb8, width * 3,
-         0, 0,
-         format,
-         data, stride,
-         0, 0, width, height);
-
-   /* Must be opened in binary mode or DOS line ending causes data
-    * to be read with one byte offset.
-    */
-   f = fopen(filename, "wb");
-   if (f) {
-      fprintf(f, "P6\n");
-      fprintf(f, "# ppm-file created by gallium\n");
-      fprintf(f, "%i %i\n", width, height);
-      fprintf(f, "255\n");
-      fwrite(rgb8, 1, height * width * 3, f);
-      fclose(f);
-   }
-   else {
-      fprintf(stderr, "Can't open %s for writing\n", filename);
-   }
-
-   FREE(rgb8);
-}
-
-
-/* FIXME: dump resources, not surfaces... */
-void
-debug_dump_surface(struct pipe_context *pipe,
-                   const char *prefix,
-                   struct pipe_surface *surface)
-{
-   struct pipe_resource *texture;
-   struct pipe_transfer *transfer;
-   void *data;
-
-   if (!surface)
-      return;
-
-   /* XXX: this doesn't necessarily work, as the driver may be using
-    * temporary storage for the surface which hasn't been propagated
-    * back into the texture.  Need to nail down the semantics of views
-    * and transfers a bit better before we can say if extra work needs
-    * to be done here:
-    */
-   texture = surface->texture;
-
-   data = pipe_transfer_map(pipe, texture, surface->u.tex.level,
-                            surface->u.tex.first_layer,
-                            PIPE_TRANSFER_READ,
-                            0, 0, surface->width, surface->height, &transfer);
-   if (!data)
-      return;
-
-   debug_dump_image(prefix,
-                    texture->format,
-                    util_format_get_blocksize(texture->format),
-                    util_format_get_nblocksx(texture->format, surface->width),
-                    util_format_get_nblocksy(texture->format, surface->height),
-                    transfer->stride,
-                    data);
-
-   pipe->transfer_unmap(pipe, transfer);
-}
-
-
-void
-debug_dump_texture(struct pipe_context *pipe,
-                   const char *prefix,
-                   struct pipe_resource *texture)
-{
-   struct pipe_surface *surface, surf_tmpl;
-
-   if (!texture)
-      return;
-
-   /* XXX for now, just dump image for layer=0, level=0 */
-   u_surface_default_template(&surf_tmpl, texture);
-   surface = pipe->create_surface(pipe, texture, &surf_tmpl);
-   if (surface) {
-      debug_dump_surface(pipe, prefix, surface);
-      pipe->surface_destroy(pipe, surface);
-   }
-}
-
-
-#pragma pack(push,2)
-struct bmp_file_header {
-   uint16_t bfType;
-   uint32_t bfSize;
-   uint16_t bfReserved1;
-   uint16_t bfReserved2;
-   uint32_t bfOffBits;
-};
-#pragma pack(pop)
-
-struct bmp_info_header {
-   uint32_t biSize;
-   int32_t biWidth;
-   int32_t biHeight;
-   uint16_t biPlanes;
-   uint16_t biBitCount;
-   uint32_t biCompression;
-   uint32_t biSizeImage;
-   int32_t biXPelsPerMeter;
-   int32_t biYPelsPerMeter;
-   uint32_t biClrUsed;
-   uint32_t biClrImportant;
-};
-
-struct bmp_rgb_quad {
-   uint8_t rgbBlue;
-   uint8_t rgbGreen;
-   uint8_t rgbRed;
-   uint8_t rgbAlpha;
-};
-
-void
-debug_dump_surface_bmp(struct pipe_context *pipe,
-                       const char *filename,
-                       struct pipe_surface *surface)
-{
-   struct pipe_transfer *transfer;
-   struct pipe_resource *texture = surface->texture;
-   void *ptr;
-
-   ptr = pipe_transfer_map(pipe, texture, surface->u.tex.level,
-                           surface->u.tex.first_layer, PIPE_TRANSFER_READ,
-                           0, 0, surface->width, surface->height, &transfer);
-
-   debug_dump_transfer_bmp(pipe, filename, transfer, ptr);
-
-   pipe->transfer_unmap(pipe, transfer);
-}
-
-void
-debug_dump_transfer_bmp(struct pipe_context *pipe,
-                        const char *filename,
-                        struct pipe_transfer *transfer, void *ptr)
-{
-   float *rgba;
-
-   if (!transfer)
-      goto error1;
-
-   rgba = MALLOC(transfer->box.width *
-		 transfer->box.height *
-		 transfer->box.depth *
-		 4*sizeof(float));
-   if (!rgba)
-      goto error1;
-
-   pipe_get_tile_rgba(transfer, ptr, 0, 0,
-                      transfer->box.width, transfer->box.height,
-                      rgba);
-
-   debug_dump_float_rgba_bmp(filename,
-                             transfer->box.width, transfer->box.height,
-                             rgba, transfer->box.width);
-
-   FREE(rgba);
-error1:
-   ;
-}
-
-void
-debug_dump_float_rgba_bmp(const char *filename,
-                          unsigned width, unsigned height,
-                          float *rgba, unsigned stride)
-{
-   FILE *stream;
-   struct bmp_file_header bmfh;
-   struct bmp_info_header bmih;
-   unsigned x, y;
-
-   if (!rgba)
-      goto error1;
-
-   bmfh.bfType = 0x4d42;
-   bmfh.bfSize = 14 + 40 + height*width*4;
-   bmfh.bfReserved1 = 0;
-   bmfh.bfReserved2 = 0;
-   bmfh.bfOffBits = 14 + 40;
-
-   bmih.biSize = 40;
-   bmih.biWidth = width;
-   bmih.biHeight = height;
-   bmih.biPlanes = 1;
-   bmih.biBitCount = 32;
-   bmih.biCompression = 0;
-   bmih.biSizeImage = height*width*4;
-   bmih.biXPelsPerMeter = 0;
-   bmih.biYPelsPerMeter = 0;
-   bmih.biClrUsed = 0;
-   bmih.biClrImportant = 0;
-
-   stream = fopen(filename, "wb");
-   if (!stream)
-      goto error1;
-
-   fwrite(&bmfh, 14, 1, stream);
-   fwrite(&bmih, 40, 1, stream);
-
-   y = height;
-   while (y--) {
-      float *ptr = rgba + (stride * y * 4);
-      for (x = 0; x < width; ++x) {
-         struct bmp_rgb_quad pixel;
-         pixel.rgbRed   = float_to_ubyte(ptr[x*4 + 0]);
-         pixel.rgbGreen = float_to_ubyte(ptr[x*4 + 1]);
-         pixel.rgbBlue  = float_to_ubyte(ptr[x*4 + 2]);
-         pixel.rgbAlpha = float_to_ubyte(ptr[x*4 + 3]);
-         fwrite(&pixel, 1, 4, stream);
-      }
-   }
-
-   fclose(stream);
-error1:
-   ;
-}
-
-void
-debug_dump_ubyte_rgba_bmp(const char *filename,
-                          unsigned width, unsigned height,
-                          const ubyte *rgba, unsigned stride)
-{
-   FILE *stream;
-   struct bmp_file_header bmfh;
-   struct bmp_info_header bmih;
-   unsigned x, y;
-
-   assert(rgba);
-   if (!rgba)
-      goto error1;
-
-   bmfh.bfType = 0x4d42;
-   bmfh.bfSize = 14 + 40 + height*width*4;
-   bmfh.bfReserved1 = 0;
-   bmfh.bfReserved2 = 0;
-   bmfh.bfOffBits = 14 + 40;
-
-   bmih.biSize = 40;
-   bmih.biWidth = width;
-   bmih.biHeight = height;
-   bmih.biPlanes = 1;
-   bmih.biBitCount = 32;
-   bmih.biCompression = 0;
-   bmih.biSizeImage = height*width*4;
-   bmih.biXPelsPerMeter = 0;
-   bmih.biYPelsPerMeter = 0;
-   bmih.biClrUsed = 0;
-   bmih.biClrImportant = 0;
-
-   stream = fopen(filename, "wb");
-   assert(stream);
-   if (!stream)
-      goto error1;
-
-   fwrite(&bmfh, 14, 1, stream);
-   fwrite(&bmih, 40, 1, stream);
-
-   y = height;
-   while (y--) {
-      const ubyte *ptr = rgba + (stride * y * 4);
-      for (x = 0; x < width; ++x) {
-         struct bmp_rgb_quad pixel;
-         pixel.rgbRed   = ptr[x*4 + 0];
-         pixel.rgbGreen = ptr[x*4 + 1];
-         pixel.rgbBlue  = ptr[x*4 + 2];
-         pixel.rgbAlpha = ptr[x*4 + 3];
-         fwrite(&pixel, 1, 4, stream);
-      }
-   }
-
-   fclose(stream);
-error1:
-   ;
-}
-
-
-/**
  * Print PIPE_TRANSFER_x flags with a message.
  */
 void
diff --git a/src/gallium/auxiliary/util/u_debug.h b/src/gallium/auxiliary/util/u_debug.h
index 671bd37a085..c2707b402cb 100644
--- a/src/gallium/auxiliary/util/u_debug.h
+++ b/src/gallium/auxiliary/util/u_debug.h
@@ -464,45 +464,6 @@ void
 debug_memory_end(unsigned long beginning);
 
 
-#ifdef DEBUG
-struct pipe_context;
-struct pipe_surface;
-struct pipe_transfer;
-struct pipe_resource;
-
-void debug_dump_image(const char *prefix,
-                      enum pipe_format format, unsigned cpp,
-                      unsigned width, unsigned height,
-                      unsigned stride,
-                      const void *data);
-void debug_dump_surface(struct pipe_context *pipe,
-			const char *prefix,
-                        struct pipe_surface *surface);   
-void debug_dump_texture(struct pipe_context *pipe,
-			const char *prefix,
-                        struct pipe_resource *texture);
-void debug_dump_surface_bmp(struct pipe_context *pipe,
-                            const char *filename,
-                            struct pipe_surface *surface);
-void debug_dump_transfer_bmp(struct pipe_context *pipe,
-                             const char *filename,
-                             struct pipe_transfer *transfer, void *ptr);
-void debug_dump_float_rgba_bmp(const char *filename,
-                               unsigned width, unsigned height,
-                               float *rgba, unsigned stride);
-void debug_dump_ubyte_rgba_bmp(const char *filename,
-                               unsigned width, unsigned height,
-                               const ubyte *rgba, unsigned stride);
-#else
-#define debug_dump_image(prefix, format, cpp, width, height, stride, data) ((void)0)
-#define debug_dump_surface(pipe, prefix, surface) ((void)0)
-#define debug_dump_surface_bmp(pipe, filename, surface) ((void)0)
-#define debug_dump_transfer_bmp(filename, transfer, ptr) ((void)0)
-#define debug_dump_float_rgba_bmp(filename, width, height, rgba, stride) ((void)0)
-#define debug_dump_ubyte_rgba_bmp(filename, width, height, rgba, stride) ((void)0)
-#endif
-
-
 void
 debug_print_transfer_flags(const char *msg, unsigned usage);
 
diff --git a/src/gallium/drivers/llvmpipe/lp_flush.c b/src/gallium/drivers/llvmpipe/lp_flush.c
index 268aab26c40..241c2ccafb7 100644
--- a/src/gallium/drivers/llvmpipe/lp_flush.c
+++ b/src/gallium/drivers/llvmpipe/lp_flush.c
@@ -32,6 +32,7 @@
 
 #include "pipe/p_defines.h"
 #include "pipe/p_screen.h"
+#include "util/u_debug_image.h"
 #include "util/u_string.h"
 #include "draw/draw_context.h"
 #include "lp_flush.h"
diff --git a/src/gallium/drivers/softpipe/sp_flush.c b/src/gallium/drivers/softpipe/sp_flush.c
index 188347bb4ca..5a29e26517d 100644
--- a/src/gallium/drivers/softpipe/sp_flush.c
+++ b/src/gallium/drivers/softpipe/sp_flush.c
@@ -38,6 +38,7 @@
 #include "sp_state.h"
 #include "sp_tile_cache.h"
 #include "sp_tex_tile_cache.h"
+#include "util/u_debug_image.h"
 #include "util/u_memory.h"
 #include "util/u_string.h"
 
diff --git a/src/gallium/drivers/svga/svga_pipe_flush.c b/src/gallium/drivers/svga/svga_pipe_flush.c
index d593c781680..8e0af12d294 100644
--- a/src/gallium/drivers/svga/svga_pipe_flush.c
+++ b/src/gallium/drivers/svga/svga_pipe_flush.c
@@ -24,6 +24,7 @@
  **********************************************************/
 
 #include "pipe/p_defines.h"
+#include "util/u_debug_image.h"
 #include "util/u_string.h"
 #include "svga_screen.h"
 #include "svga_surface.h"
diff --git a/src/gallium/targets/graw-null/graw_util.c b/src/gallium/targets/graw-null/graw_util.c
index 07693e85f6a..03b45d99e9d 100644
--- a/src/gallium/targets/graw-null/graw_util.c
+++ b/src/gallium/targets/graw-null/graw_util.c
@@ -5,6 +5,7 @@
 #include "pipe/p_state.h"
 #include "tgsi/tgsi_text.h"
 #include "util/u_debug.h"
+#include "util/u_debug_image.h"
 #include "util/u_memory.h"
 #include "state_tracker/graw.h"
 
diff --git a/src/gallium/tests/graw/graw_util.h b/src/gallium/tests/graw/graw_util.h
index f09c1eadc9c..3c7dbd061cc 100644
--- a/src/gallium/tests/graw/graw_util.h
+++ b/src/gallium/tests/graw/graw_util.h
@@ -9,6 +9,7 @@
 
 #include "util/u_box.h"    
 #include "util/u_debug.h"
+#include "util/u_debug_image.h"
 #include "util/u_draw_quad.h"
 #include "util/u_format.h"
 #include "util/u_inlines.h"
diff --git a/src/gallium/tests/trivial/quad-tex.c b/src/gallium/tests/trivial/quad-tex.c
index 4c5a9200a52..ddee2942af9 100644
--- a/src/gallium/tests/trivial/quad-tex.c
+++ b/src/gallium/tests/trivial/quad-tex.c
@@ -50,7 +50,7 @@
 /* u_sampler_view_default_template */
 #include "util/u_sampler.h"
 /* debug_dump_surface_bmp */
-#include "util/u_debug.h"
+#include "util/u_debug_image.h"
 /* util_draw_vertex_buffer helper */
 #include "util/u_draw_quad.h"
 /* FREE & CALLOC_STRUCT */
diff --git a/src/gallium/tests/trivial/tri.c b/src/gallium/tests/trivial/tri.c
index c71a63f44e5..914f5e75fa9 100644
--- a/src/gallium/tests/trivial/tri.c
+++ b/src/gallium/tests/trivial/tri.c
@@ -48,7 +48,7 @@
 #include "cso_cache/cso_context.h"
 
 /* debug_dump_surface_bmp */
-#include "util/u_debug.h"
+#include "util/u_debug_image.h"
 /* util_draw_vertex_buffer helper */
 #include "util/u_draw_quad.h"
 /* FREE & CALLOC_STRUCT */