[Mesa-dev] [PATCH 4/4] gallium/util: move u_queue.{c, h} to src/util

Timothy Arceri tarceri at itsqueeze.com
Wed Mar 8 04:36:34 UTC 2017


This will allow us to use it outside of gallium for things like
compressing shader cache entries.
---
 src/gallium/auxiliary/Makefile.sources     | 2 --
 src/util/Makefile.sources                  | 2 ++
 src/{gallium/auxiliary => }/util/u_queue.c | 0
 src/{gallium/auxiliary => }/util/u_queue.h | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename src/{gallium/auxiliary => }/util/u_queue.c (100%)
 rename src/{gallium/auxiliary => }/util/u_queue.h (100%)

diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 9063b51..c3a3af9 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -269,22 +269,20 @@ C_SOURCES := \
 	util/u_network.c \
 	util/u_network.h \
 	util/u_pack_color.h \
 	util/u_pointer.h \
 	util/u_prim.h \
 	util/u_prim_restart.c \
 	util/u_prim_restart.h \
 	util/u_pstipple.c \
 	util/u_pstipple.h \
 	util/u_pwr8.h \
-	util/u_queue.c \
-	util/u_queue.h \
 	util/u_range.h \
 	util/u_rect.h \
 	util/u_resource.c \
 	util/u_resource.h \
 	util/u_ringbuffer.c \
 	util/u_ringbuffer.h \
 	util/u_sampler.c \
 	util/u_sampler.h \
 	util/u_simple_shaders.c \
 	util/u_simple_shaders.h \
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index 8b5ee2d..e6c1c76 100644
--- a/src/util/Makefile.sources
+++ b/src/util/Makefile.sources
@@ -37,19 +37,21 @@ MESA_UTIL_FILES :=	\
 	slab.h \
 	string_to_uint_map.h \
 	string_to_uint_map.cpp \
 	strndup.c \
 	strndup.h \
 	strtod.c \
 	strtod.h \
 	texcompress_rgtc_tmp.h \
 	u_atomic.h \
 	u_endian.h \
+	u_queue.c \
+	u_queue.h \
 	u_string.h \
 	u_thread.h \
 	u_vector.c \
 	u_vector.h \
 	vk_alloc.h \
 	vk_util.h
 
 MESA_UTIL_GENERATED_FILES = \
 	format_srgb.c
diff --git a/src/gallium/auxiliary/util/u_queue.c b/src/util/u_queue.c
similarity index 100%
rename from src/gallium/auxiliary/util/u_queue.c
rename to src/util/u_queue.c
diff --git a/src/gallium/auxiliary/util/u_queue.h b/src/util/u_queue.h
similarity index 100%
rename from src/gallium/auxiliary/util/u_queue.h
rename to src/util/u_queue.h
-- 
2.9.3



More information about the mesa-dev mailing list