Mesa (staging/20.0): util: promote u_debug_memory.c to src/util

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: 91de922c7ff280b33dec31908c0146761b832d97
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=91de922c7ff280b33dec31908c0146761b832d97

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Mon Feb 10 13:08:28 2020 +0100

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 at pnwbakers>
Reviewed-by: Jose Fonseca <jfonseca at 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)

---

 .pick_status.json                                 | 2 +-
 src/gallium/auxiliary/Makefile.sources            | 1 -
 src/gallium/auxiliary/meson.build                 | 1 -
 src/util/Makefile.sources                         | 1 +
 src/util/meson.build                              | 1 +
 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 a42b83e4b18..52a91f8d916 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 2cba524f2bc..8ba33561bef 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 c36f3083739..a77afcd78d8 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 7791be73cde..9da29cc7390 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
similarity index 100%
rename from src/gallium/auxiliary/util/u_debug_memory.c
rename to src/util/u_debug_memory.c