diff options
| author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2020-02-10 13:08:28 +0100 |
|---|---|---|
| committer | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2020-02-21 10:32:19 +0100 |
| commit | 2e3318b151abddd456077ec0eed13f95245ce344 (patch) | |
| tree | 826d59e3e179b59eac27c33a5215c00b73e10a0a | |
| parent | 8021daeb1fb58415af5d0a779368dc6617af947e (diff) | |
| download | mesa-2e3318b151abddd456077ec0eed13f95245ce344.tar.gz | |
util: promote u_debug_memory.c to src/util
When os_memory_debug.h was promoted to src/util, this source-file on
which it depends on when the debug-flag is set on windows was left
out. So let's move this also.
It doesn't seem there's any way of triggering this issue right now, but
it seems better to correct this to avoid this from biting us in the ass
in the future.
Fixes: 88c4680b5a5 ("util: promote u_memory to src/util")
Reviewed-by: Dylan Baker <dylan@pnwbakers>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3844>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3844>
| -rw-r--r-- | src/gallium/auxiliary/Makefile.sources | 1 | ||||
| -rw-r--r-- | src/gallium/auxiliary/meson.build | 1 | ||||
| -rw-r--r-- | src/util/Makefile.sources | 1 | ||||
| -rw-r--r-- | src/util/meson.build | 1 | ||||
| -rw-r--r-- | src/util/u_debug_memory.c (renamed from src/gallium/auxiliary/util/u_debug_memory.c) | 0 |
5 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index 2fc8ffbe40d..88b5d418499 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -224,7 +224,6 @@ C_SOURCES := \ util/u_debug_flush.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 \ util/u_debug_stack.c \ diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index f623af9ed69..62c00fc26ba 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -244,7 +244,6 @@ files_libgallium = files( 'util/u_debug_flush.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', 'util/u_debug_stack.c', diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources index 5a8f9429428..575bb5fb6e7 100644 --- a/src/util/Makefile.sources +++ b/src/util/Makefile.sources @@ -108,6 +108,7 @@ MESA_UTIL_FILES := \ u_vector.h \ u_debug.c \ u_debug.h \ + u_debug_memory.c \ u_cpu_detect.c \ u_cpu_detect.h \ os_memory_aligned.h \ diff --git a/src/util/meson.build b/src/util/meson.build index 3b2ac083a14..e8e8eb111f0 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -113,6 +113,7 @@ files_mesa_util = files( 'u_mm.h', 'u_debug.c', 'u_debug.h', + 'u_debug_memory.c', 'u_cpu_detect.c', 'u_cpu_detect.h', 'vma.c', diff --git a/src/gallium/auxiliary/util/u_debug_memory.c b/src/util/u_debug_memory.c index e468fd0b252..e468fd0b252 100644 --- a/src/gallium/auxiliary/util/u_debug_memory.c +++ b/src/util/u_debug_memory.c |