1 files changed, 173 insertions, 179 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_dump.h b/mesalib/src/gallium/auxiliary/util/u_dump.h
index 7d89db163..3890b3bdd 100644
--- a/mesalib/src/gallium/auxiliary/util/u_dump.h
+++ b/mesalib/src/gallium/auxiliary/util/u_dump.h
@@ -1,179 +1,173 @@
-/**************************************************************************
- * 
- * Copyright 2009 VMware, Inc.
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
- **************************************************************************/
-
-/**
- * @file
- * Dump data in human/machine readable format.
- * 
- * @author Jose Fonseca <jfonseca@vmware.com>
- */
-
-#ifndef U_DEBUG_DUMP_H_
-#define U_DEBUG_DUMP_H_
-
-
-#include "pipe/p_compiler.h"
-#include "pipe/p_state.h"
-
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-
-#define UTIL_DUMP_INVALID_NAME "<invalid>"
-
-
-struct os_stream;
-
-
-/* Duplicated here for convenience */
-extern struct os_stream *
-os_log_stream;
-
-
-/*
- * p_defines.h
- *
- * XXX: These functions don't really dump anything -- just translate into
- * strings so a verb better than "dump" should be used instead, in order to
- * free up the namespace to the true dumper functions.
- */
-
-const char *
-util_dump_blend_factor(unsigned value, boolean shortened);
-
-const char *
-util_dump_blend_func(unsigned value, boolean shortened);
-
-const char *
-util_dump_logicop(unsigned value, boolean shortened);
-
-const char *
-util_dump_func(unsigned value, boolean shortened);
-
-const char *
-util_dump_stencil_op(unsigned value, boolean shortened);
-
-const char *
-util_dump_tex_target(unsigned value, boolean shortened);
-
-const char *
-util_dump_tex_wrap(unsigned value, boolean shortened);
-
-const char *
-util_dump_tex_mipfilter(unsigned value, boolean shortened);
-
-const char *
-util_dump_tex_filter(unsigned value, boolean shortened);
-
-
-/*
- * p_state.h, through an os_stream
- */
-
-void
-util_dump_template(struct os_stream *stream,
-                   const struct pipe_resource *templat);
-
-void
-util_dump_rasterizer_state(struct os_stream *stream,
-                           const struct pipe_rasterizer_state *state);
-
-void
-util_dump_poly_stipple(struct os_stream *stream,
-                       const struct pipe_poly_stipple *state);
-
-void
-util_dump_viewport_state(struct os_stream *stream,
-                         const struct pipe_viewport_state *state);
-
-void
-util_dump_scissor_state(struct os_stream *stream,
-                        const struct pipe_scissor_state *state);
-
-void
-util_dump_clip_state(struct os_stream *stream,
-                     const struct pipe_clip_state *state);
-
-void
-util_dump_shader_state(struct os_stream *stream,
-                       const struct pipe_shader_state *state);
-
-void
-util_dump_depth_stencil_alpha_state(struct os_stream *stream,
-                                    const struct pipe_depth_stencil_alpha_state *state);
-
-void
-util_dump_rt_blend_state(struct os_stream *stream,
-                         const struct pipe_rt_blend_state *state);
-
-void
-util_dump_blend_state(struct os_stream *stream,
-                      const struct pipe_blend_state *state);
-
-void
-util_dump_blend_color(struct os_stream *stream,
-                      const struct pipe_blend_color *state);
-
-void
-util_dump_stencil_ref(struct os_stream *stream,
-                      const struct pipe_stencil_ref *state);
-
-void
-util_dump_framebuffer_state(struct os_stream *stream,
-                            const struct pipe_framebuffer_state *state);
-
-void
-util_dump_sampler_state(struct os_stream *stream,
-                        const struct pipe_sampler_state *state);
-
-void
-util_dump_surface(struct os_stream *stream,
-                  const struct pipe_surface *state);
-
-void
-util_dump_transfer(struct os_stream *stream,
-                   const struct pipe_transfer *state);
-
-void
-util_dump_vertex_buffer(struct os_stream *stream,
-                        const struct pipe_vertex_buffer *state);
-
-void
-util_dump_vertex_element(struct os_stream *stream,
-                         const struct pipe_vertex_element *state);
-
-
-/* FIXME: Move the other debug_dump_xxx functions out of u_debug.h into here. */
-
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* U_DEBUG_H_ */
+/**************************************************************************
+ * 
+ * Copyright 2009 VMware, Inc.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+/**
+ * @file
+ * Dump data in human/machine readable format.
+ * 
+ * @author Jose Fonseca <jfonseca@vmware.com>
+ */
+
+#ifndef U_DEBUG_DUMP_H_
+#define U_DEBUG_DUMP_H_
+
+
+#include "pipe/p_compiler.h"
+#include "pipe/p_state.h"
+
+#include <stdio.h>
+
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+
+#define UTIL_DUMP_INVALID_NAME "<invalid>"
+
+
+/*
+ * p_defines.h
+ *
+ * XXX: These functions don't really dump anything -- just translate into
+ * strings so a verb better than "dump" should be used instead, in order to
+ * free up the namespace to the true dumper functions.
+ */
+
+const char *
+util_dump_blend_factor(unsigned value, boolean shortened);
+
+const char *
+util_dump_blend_func(unsigned value, boolean shortened);
+
+const char *
+util_dump_logicop(unsigned value, boolean shortened);
+
+const char *
+util_dump_func(unsigned value, boolean shortened);
+
+const char *
+util_dump_stencil_op(unsigned value, boolean shortened);
+
+const char *
+util_dump_tex_target(unsigned value, boolean shortened);
+
+const char *
+util_dump_tex_wrap(unsigned value, boolean shortened);
+
+const char *
+util_dump_tex_mipfilter(unsigned value, boolean shortened);
+
+const char *
+util_dump_tex_filter(unsigned value, boolean shortened);
+
+
+/*
+ * p_state.h, through a FILE
+ */
+
+void
+util_dump_template(FILE *stream,
+                   const struct pipe_resource *templat);
+
+void
+util_dump_rasterizer_state(FILE *stream,
+                           const struct pipe_rasterizer_state *state);
+
+void
+util_dump_poly_stipple(FILE *stream,
+                       const struct pipe_poly_stipple *state);
+
+void
+util_dump_viewport_state(FILE *stream,
+                         const struct pipe_viewport_state *state);
+
+void
+util_dump_scissor_state(FILE *stream,
+                        const struct pipe_scissor_state *state);
+
+void
+util_dump_clip_state(FILE *stream,
+                     const struct pipe_clip_state *state);
+
+void
+util_dump_shader_state(FILE *stream,
+                       const struct pipe_shader_state *state);
+
+void
+util_dump_depth_stencil_alpha_state(FILE *stream,
+                                    const struct pipe_depth_stencil_alpha_state *state);
+
+void
+util_dump_rt_blend_state(FILE *stream,
+                         const struct pipe_rt_blend_state *state);
+
+void
+util_dump_blend_state(FILE *stream,
+                      const struct pipe_blend_state *state);
+
+void
+util_dump_blend_color(FILE *stream,
+                      const struct pipe_blend_color *state);
+
+void
+util_dump_stencil_ref(FILE *stream,
+                      const struct pipe_stencil_ref *state);
+
+void
+util_dump_framebuffer_state(FILE *stream,
+                            const struct pipe_framebuffer_state *state);
+
+void
+util_dump_sampler_state(FILE *stream,
+                        const struct pipe_sampler_state *state);
+
+void
+util_dump_surface(FILE *stream,
+                  const struct pipe_surface *state);
+
+void
+util_dump_transfer(FILE *stream,
+                   const struct pipe_transfer *state);
+
+void
+util_dump_vertex_buffer(FILE *stream,
+                        const struct pipe_vertex_buffer *state);
+
+void
+util_dump_vertex_element(FILE *stream,
+                         const struct pipe_vertex_element *state);
+
+
+/* FIXME: Move the other debug_dump_xxx functions out of u_debug.h into here. */
+
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* U_DEBUG_H_ */