diff options
| author | Dylan Baker <[email protected]> | 2018-09-21 11:21:57 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-10-30 14:32:52 -0700 |
| commit | 314777e86ae71d1397de229cfcdcb15a3f668f2d (patch) | |
| tree | f1cf5ecc10d722c3d07992bc59b837d8a0d3075d | |
| parent | 68074dfa0eab4cd3388cfc23051ece4577e8ec90 (diff) | |
gallium/util: move memory debug declarations into u_debug_gallium
Tested-by: Brian Paul <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/util/u_debug.c | 1 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_debug.h | 7 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_debug_gallium.h | 6 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_debug_memory.c | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/wgl/stw_device.c | 1 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/gallium/auxiliary/util/u_debug.c index 081ff10f210..2584a1f297d 100644 --- 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 5be648e3f20..05ee08d9214 100644 --- 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 df4e919c803..0710ce2b703 100644 --- 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 0a52daa5b47..0c822369a00 100644 --- 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 e43f12f7f2b..f04689a974d 100644 --- 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" |