diff options
| author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2020-02-10 13:08:28 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-02-24 11:10:36 -0800 |
| commit | 46b7b11cbf9783d7b0f4d075096fcadef14b15d0 (patch) | |
| tree | c15dc54b48f0481a71fc4b6d45718486a848e80b | |
| parent | 99c086202e3c24e55fc0230b877c4b1f7174b9d4 (diff) | |
| download | mesa-46b7b11cbf9783d7b0f4d075096fcadef14b15d0.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>
(cherry picked from commit 2e3318b151abddd456077ec0eed13f95245ce344)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -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 |
6 files changed, 3 insertions, 3 deletions
diff --git a/.pick_status.json b/.pick_status.json index 50d83e4812d..f3938cab99d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -499,7 +499,7 @@ "description": "util: promote u_debug_memory.c to src/util", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "88c4680b5a50ea8840c38aa0a80acde63ef1677b" }, diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index 8961ae2a1e0..e924f80b65b 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 c7ae8fd53e2..800ca95cd1e 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 109de1ebf6e..1ecd41f325c 100644 --- a/src/util/Makefile.sources +++ b/src/util/Makefile.sources @@ -83,6 +83,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 f69ebe9cab3..8507a1487a7 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -105,6 +105,7 @@ files_mesa_util = files( 'u_math.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 |