From 37db383abbec071e2b3d26d0a531ec8296705b63 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 1 Oct 2018 11:55:27 -0700 Subject: [PATCH] util: Move u_debug to utils MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Tested-by: Brian Paul Reviewed-by: Marek Olšák --- src/gallium/auxiliary/Makefile.sources | 2 -- src/gallium/auxiliary/meson.build | 2 -- src/gallium/auxiliary/util/u_cpu_detect.c | 2 +- src/gallium/auxiliary/util/u_debug_stack.c | 2 +- src/gallium/auxiliary/util/u_debug_symbol.c | 2 +- src/gallium/auxiliary/util/u_format_zs.c | 1 - src/gallium/auxiliary/util/u_log.h | 2 +- src/util/Makefile.sources | 2 ++ src/util/meson.build | 2 ++ src/{gallium/auxiliary => }/util/u_debug.c | 0 src/{gallium/auxiliary => }/util/u_debug.h | 0 11 files changed, 8 insertions(+), 9 deletions(-) rename src/{gallium/auxiliary => }/util/u_debug.c (100%) rename src/{gallium/auxiliary => }/util/u_debug.h (100%) diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index 75df7d0717a..72cf2ec6443 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -224,8 +224,6 @@ C_SOURCES := \ util/u_cache.h \ util/u_cpu_detect.c \ util/u_cpu_detect.h \ - util/u_debug.c \ - util/u_debug.h \ util/u_debug_gallium.h \ util/u_debug_gallium.c \ util/u_debug_describe.c \ diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index 9c158b6b373..1b5eb4d155d 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -244,8 +244,6 @@ files_libgallium = files( 'util/u_cache.h', 'util/u_cpu_detect.c', 'util/u_cpu_detect.h', - 'util/u_debug.c', - 'util/u_debug.h', 'util/u_debug_gallium.h', 'util/u_debug_gallium.c', 'util/u_debug_describe.c', diff --git a/src/gallium/auxiliary/util/u_cpu_detect.c b/src/gallium/auxiliary/util/u_cpu_detect.c index 751443f06f9..4dbb4d8fb58 100644 --- a/src/gallium/auxiliary/util/u_cpu_detect.c +++ b/src/gallium/auxiliary/util/u_cpu_detect.c @@ -34,7 +34,7 @@ #include "pipe/p_config.h" -#include "u_debug.h" +#include "util/u_debug.h" #include "u_cpu_detect.h" #include "c11/threads.h" diff --git a/src/gallium/auxiliary/util/u_debug_stack.c b/src/gallium/auxiliary/util/u_debug_stack.c index b1d4cfea6c1..235e116671b 100644 --- a/src/gallium/auxiliary/util/u_debug_stack.c +++ b/src/gallium/auxiliary/util/u_debug_stack.c @@ -32,7 +32,7 @@ * @author Jose Fonseca */ -#include "u_debug.h" +#include "util/u_debug.h" #include "u_debug_symbol.h" #include "u_debug_stack.h" diff --git a/src/gallium/auxiliary/util/u_debug_symbol.c b/src/gallium/auxiliary/util/u_debug_symbol.c index 84760430489..22e6c8ce771 100644 --- a/src/gallium/auxiliary/util/u_debug_symbol.c +++ b/src/gallium/auxiliary/util/u_debug_symbol.c @@ -36,7 +36,7 @@ #include "os/os_thread.h" #include "util/u_string.h" -#include "u_debug.h" +#include "util/u_debug.h" #include "u_debug_symbol.h" #include "u_hash_table.h" diff --git a/src/gallium/auxiliary/util/u_format_zs.c b/src/gallium/auxiliary/util/u_format_zs.c index 4b801d2dcf7..ff584769d12 100644 --- a/src/gallium/auxiliary/util/u_format_zs.c +++ b/src/gallium/auxiliary/util/u_format_zs.c @@ -26,7 +26,6 @@ **************************************************************************/ -#include "u_debug.h" #include "u_format_zs.h" #include "util/u_math.h" diff --git a/src/gallium/auxiliary/util/u_log.h b/src/gallium/auxiliary/util/u_log.h index 09c47caee55..90f5d0f4de1 100644 --- a/src/gallium/auxiliary/util/u_log.h +++ b/src/gallium/auxiliary/util/u_log.h @@ -47,7 +47,7 @@ #include -#include "u_debug.h" +#include "util/u_debug.h" struct u_log_page; struct u_log_auto_logger; diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources index b1dad51cbe6..af2ad85da19 100644 --- a/src/util/Makefile.sources +++ b/src/util/Makefile.sources @@ -68,6 +68,8 @@ MESA_UTIL_FILES := \ u_thread.h \ u_vector.c \ u_vector.h \ + u_debug.c \ + u_debug.h \ vma.c \ vma.h diff --git a/src/util/meson.build b/src/util/meson.build index cf173ee2bd5..3b84f411112 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -92,6 +92,8 @@ files_mesa_util = files( 'u_vector.h', 'u_math.c', 'u_math.h', + 'u_debug.c', + 'u_debug.h', 'vma.c', 'vma.h', ) diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/util/u_debug.c similarity index 100% rename from src/gallium/auxiliary/util/u_debug.c rename to src/util/u_debug.c diff --git a/src/gallium/auxiliary/util/u_debug.h b/src/util/u_debug.h similarity index 100% rename from src/gallium/auxiliary/util/u_debug.h rename to src/util/u_debug.h -- 2.30.2