From e87969eed5f6dc9045f196c0a86e0d3ced873823 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Tue, 8 Nov 2022 16:12:10 +0800 Subject: [PATCH] util:Move only gallium used u_debug_refcnt.* and u_debug_describe.* into src/gallium/auxiliary/util/ MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Because these files indeed doesn't belongs to src/util, they are tightly coupled with src/gallium/auxiliary Signed-off-by: Yonggang Luo Reviewed-by: Marek Olšák Reviewed-by: Faith Ekstrand Part-of: --- src/gallium/auxiliary/meson.build | 4 ++++ src/{ => gallium/auxiliary}/util/u_debug_describe.c | 0 src/{ => gallium/auxiliary}/util/u_debug_describe.h | 0 src/{ => gallium/auxiliary}/util/u_debug_refcnt.c | 0 src/{ => gallium/auxiliary}/util/u_debug_refcnt.h | 0 src/util/meson.build | 4 ---- 6 files changed, 4 insertions(+), 4 deletions(-) rename src/{ => gallium/auxiliary}/util/u_debug_describe.c (100%) rename src/{ => gallium/auxiliary}/util/u_debug_describe.h (100%) rename src/{ => gallium/auxiliary}/util/u_debug_refcnt.c (100%) rename src/{ => gallium/auxiliary}/util/u_debug_refcnt.h (100%) diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index 8094a96..36012c8 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -215,10 +215,14 @@ files_libgallium = files( 'util/u_compute.c', 'util/u_compute.h', 'util/u_debug_cb.h', + 'util/u_debug_describe.c', + 'util/u_debug_describe.h', 'util/u_debug_flush.c', 'util/u_debug_flush.h', 'util/u_debug_image.c', 'util/u_debug_image.h', + 'util/u_debug_refcnt.c', + 'util/u_debug_refcnt.h', 'util/u_draw.c', 'util/u_draw.h', 'util/u_draw_quad.c', diff --git a/src/util/u_debug_describe.c b/src/gallium/auxiliary/util/u_debug_describe.c similarity index 100% rename from src/util/u_debug_describe.c rename to src/gallium/auxiliary/util/u_debug_describe.c diff --git a/src/util/u_debug_describe.h b/src/gallium/auxiliary/util/u_debug_describe.h similarity index 100% rename from src/util/u_debug_describe.h rename to src/gallium/auxiliary/util/u_debug_describe.h diff --git a/src/util/u_debug_refcnt.c b/src/gallium/auxiliary/util/u_debug_refcnt.c similarity index 100% rename from src/util/u_debug_refcnt.c rename to src/gallium/auxiliary/util/u_debug_refcnt.c diff --git a/src/util/u_debug_refcnt.h b/src/gallium/auxiliary/util/u_debug_refcnt.h similarity index 100% rename from src/util/u_debug_refcnt.h rename to src/gallium/auxiliary/util/u_debug_refcnt.h diff --git a/src/util/meson.build b/src/util/meson.build index f4946d7..bf6fa11 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -130,10 +130,6 @@ files_mesa_util = files( 'u_atomic.h', 'u_call_once.c', 'u_call_once.h', - 'u_debug_describe.c', - 'u_debug_describe.h', - 'u_debug_refcnt.c', - 'u_debug_refcnt.h', 'u_dl.c', 'u_dl.h', 'u_dynarray.c', -- 2.7.4