Mesa (master): gallium/util: move debug_print_tranfer_flags to u_debug_galilum

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 68074dfa0eab4cd3388cfc23051ece4577e8ec90
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=68074dfa0eab4cd3388cfc23051ece4577e8ec90

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Fri Sep 21 11:07:57 2018 -0700

gallium/util: move debug_print_tranfer_flags to u_debug_galilum

This also appears to be unused.

Tested-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/auxiliary/util/u_debug.c         | 18 ------------------
 src/gallium/auxiliary/util/u_debug.h         |  3 ---
 src/gallium/auxiliary/util/u_debug_gallium.c | 13 +++++++++++++
 src/gallium/auxiliary/util/u_debug_gallium.h |  3 +++
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/gallium/auxiliary/util/u_debug.c
index 7e28746890..081ff10f21 100644
--- a/src/gallium/auxiliary/util/u_debug.c
+++ b/src/gallium/auxiliary/util/u_debug.c
@@ -31,7 +31,6 @@
 
 #include "pipe/p_compiler.h"
 #include "util/u_debug.h"
-#include "util/u_dump.h"
 #include "pipe/p_format.h"
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"
@@ -442,20 +441,3 @@ debug_funclog_enter_exit(const char* f, UNUSED const int line,
    debug_printf("%s\n", f);
 }
 #endif
-
-
-
-#ifdef DEBUG
-/**
- * Print PIPE_TRANSFER_x flags with a message.
- */
-void
-debug_print_transfer_flags(const char *msg, unsigned usage)
-{
-   debug_printf("%s: ", msg);
-   util_dump_transfer_usage(stdout, usage);
-   printf("\n");
-}
-
-
-#endif
diff --git a/src/gallium/auxiliary/util/u_debug.h b/src/gallium/auxiliary/util/u_debug.h
index 2b67a15548..5be648e3f2 100644
--- a/src/gallium/auxiliary/util/u_debug.h
+++ b/src/gallium/auxiliary/util/u_debug.h
@@ -461,9 +461,6 @@ void
 debug_memory_end(unsigned long beginning);
 
 
-void
-debug_print_transfer_flags(const char *msg, unsigned usage);
-
 #ifdef	__cplusplus
 }
 #endif
diff --git a/src/gallium/auxiliary/util/u_debug_gallium.c b/src/gallium/auxiliary/util/u_debug_gallium.c
index 0f2f86ec1c..9dad0c27c5 100644
--- a/src/gallium/auxiliary/util/u_debug_gallium.c
+++ b/src/gallium/auxiliary/util/u_debug_gallium.c
@@ -29,6 +29,7 @@
 
 #include "util/u_debug.h"
 #include "u_debug_gallium.h"
+#include "u_dump.h"
 #include "u_format.h"
 
 #ifdef DEBUG
@@ -41,6 +42,18 @@ debug_print_format(const char *msg, unsigned fmt)
 
 
 /**
+ * Print PIPE_TRANSFER_x flags with a message.
+ */
+void
+debug_print_transfer_flags(const char *msg, unsigned usage)
+{
+   debug_printf("%s: ", msg);
+   util_dump_transfer_usage(stdout, usage);
+   printf("\n");
+}
+
+
+/**
  * Print PIPE_BIND_x flags with a message.
  */
 void
diff --git a/src/gallium/auxiliary/util/u_debug_gallium.h b/src/gallium/auxiliary/util/u_debug_gallium.h
index 450137217b..df4e919c80 100644
--- a/src/gallium/auxiliary/util/u_debug_gallium.h
+++ b/src/gallium/auxiliary/util/u_debug_gallium.h
@@ -44,6 +44,9 @@ void debug_print_format(const char *msg, unsigned fmt);
 #ifdef DEBUG
 
 void
+debug_print_transfer_flags(const char *msg, unsigned usage);
+
+void
 debug_print_bind_flags(const char *msg, unsigned usage);
 
 void