gallium/util: move memory debug declarations into u_debug_gallium

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

diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/gallium/auxiliary/util/u_debug.c
index 081ff10f21010b9c6eea4f31d7b04629bcb21504..2584a1f297d2573dc796b75248e68b566c1ebe9e 100644 (file)
--- a/src/gallium/auxiliary/util/u_debug.c
+++ b/src/gallium/auxiliary/util/u_debug.c
@@ -34,7 +34,6 @@
 #include "pipe/p_format.h"
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"
-#include "util/u_memory.h"
 #include "util/u_string.h"
 #include "util/u_math.h"
 #include <inttypes.h>

diff --git a/src/gallium/auxiliary/util/u_debug.h b/src/gallium/auxiliary/util/u_debug.h
index 5be648e3f20995b97b41330e4bad36b286a6b71b..05ee08d92142d1291636255b975e3664dc27383f 100644 (file)
--- a/src/gallium/auxiliary/util/u_debug.h
+++ b/src/gallium/auxiliary/util/u_debug.h
@@ -454,13 +454,6 @@ debug_get_option_ ## sufix (void) \
 }
 
 
-unsigned long
-debug_memory_begin(void);
-
-void 
-debug_memory_end(unsigned long beginning);
-
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/gallium/auxiliary/util/u_debug_gallium.h b/src/gallium/auxiliary/util/u_debug_gallium.h
index df4e919c803d5118fc743bcecb6d5c431684eda5..0710ce2b7034dfec60a5408399f06d87ba004d7f 100644 (file)
--- a/src/gallium/auxiliary/util/u_debug_gallium.h
+++ b/src/gallium/auxiliary/util/u_debug_gallium.h
@@ -35,6 +35,12 @@
 extern "C" {
 #endif
 
+unsigned long
+debug_memory_begin(void);
+
+void 
+debug_memory_end(unsigned long beginning);
+
 #ifdef DEBUG
 void debug_print_format(const char *msg, unsigned fmt);
 #else

diff --git a/src/gallium/auxiliary/util/u_debug_memory.c b/src/gallium/auxiliary/util/u_debug_memory.c
index 0a52daa5b47a747bc178385367b831c7b5c00d41..0c822369a003267091e367aeaea4e934eb824276 100644 (file)
--- a/src/gallium/auxiliary/util/u_debug_memory.c
+++ b/src/gallium/auxiliary/util/u_debug_memory.c
@@ -41,6 +41,7 @@
 #include "os/os_thread.h"
 
 #include "util/u_debug.h"
+#include "util/u_debug_gallium.h"
 #include "util/u_debug_stack.h"
 #include "util/list.h"
 

diff --git a/src/gallium/state_trackers/wgl/stw_device.c b/src/gallium/state_trackers/wgl/stw_device.c
index e43f12f7f2b0df2510600980a5d6ce6df7979776..f04689a974dfdf99a585922a3e59ef18b3de29ad 100644 (file)
--- a/src/gallium/state_trackers/wgl/stw_device.c
+++ b/src/gallium/state_trackers/wgl/stw_device.c
@@ -29,6 +29,7 @@
 
 #include "glapi/glapi.h"
 #include "util/u_debug.h"
+#include "util/u_debug_gallium.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 #include "pipe/p_screen.h"