Mesa (master): mesa: move u_idalloc from gallium/aux/util to util
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Sep 10 07:34:39 UTC 2020
Module: Mesa
Branch: master
Commit: 87ef970ee65535d026a2bcd8a0e82cf84164e10b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=87ef970ee65535d026a2bcd8a0e82cf84164e10b
Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date: Tue Sep 8 20:41:14 2020 +0200
mesa: move u_idalloc from gallium/aux/util to util
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6600>
---
src/gallium/auxiliary/Makefile.sources | 2 --
src/gallium/auxiliary/meson.build | 2 --
src/util/Makefile.sources | 2 ++
src/util/meson.build | 2 ++
src/{gallium/auxiliary => }/util/u_idalloc.c | 0
src/{gallium/auxiliary => }/util/u_idalloc.h | 0
6 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 3fd7ea72909..d7ace1f5f74 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -257,8 +257,6 @@ C_SOURCES := \
util/u_hash_table.h \
util/u_helpers.c \
util/u_helpers.h \
- util/u_idalloc.c \
- util/u_idalloc.h \
util/u_index_modify.c \
util/u_index_modify.h \
util/u_inlines.h \
diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index a1a1b5b64e6..1de89c93aed 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -273,8 +273,6 @@ files_libgallium = files(
'util/u_hash_table.h',
'util/u_helpers.c',
'util/u_helpers.h',
- 'util/u_idalloc.c',
- 'util/u_idalloc.h',
'util/u_index_modify.c',
'util/u_index_modify.h',
'util/u_inlines.h',
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index 6b01b137b27..7fdcf61dca9 100644
--- a/src/util/Makefile.sources
+++ b/src/util/Makefile.sources
@@ -51,6 +51,8 @@ MESA_UTIL_FILES := \
half_float.h \
hash_table.c \
hash_table.h \
+ u_idalloc.c \
+ u_idalloc.h \
list.h \
macros.h \
mesa-sha1.c \
diff --git a/src/util/meson.build b/src/util/meson.build
index 976034cc729..e90f68e71d1 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -54,6 +54,8 @@ files_mesa_util = files(
'half_float.h',
'hash_table.c',
'hash_table.h',
+ 'u_idalloc.c',
+ 'u_idalloc.h',
'list.h',
'macros.h',
'mesa-sha1.c',
diff --git a/src/gallium/auxiliary/util/u_idalloc.c b/src/util/u_idalloc.c
similarity index 100%
rename from src/gallium/auxiliary/util/u_idalloc.c
rename to src/util/u_idalloc.c
diff --git a/src/gallium/auxiliary/util/u_idalloc.h b/src/util/u_idalloc.h
similarity index 100%
rename from src/gallium/auxiliary/util/u_idalloc.h
rename to src/util/u_idalloc.h
More information about the mesa-commit
mailing list