diff options
| author | Dylan Baker <[email protected]> | 2018-10-01 11:59:21 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-10-30 14:32:52 -0700 |
| commit | fb02bd3d1cbfdacabc6403f2da7b5d0a9aa527e6 (patch) | |
| tree | ed398e461d85af75f864de30afdb0ce69bc10f66 | |
| parent | 37db383abbec071e2b3d26d0a531ec8296705b63 (diff) | |
util: move u_cpu_detect to util
CC: [email protected]
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107870
Fixes: 80825abb5d1a7491035880253ffd531c55acae6b
("move u_math to src/util")
Tested-by: Brian Paul <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/Makefile.sources | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/meson.build | 2 | ||||
| -rw-r--r-- | src/util/Makefile.sources | 2 | ||||
| -rw-r--r-- | src/util/meson.build | 2 | ||||
| -rw-r--r-- | src/util/u_cpu_detect.c (renamed from src/gallium/auxiliary/util/u_cpu_detect.c) | 0 | ||||
| -rw-r--r-- | src/util/u_cpu_detect.h (renamed from src/gallium/auxiliary/util/u_cpu_detect.h) | 0 |
6 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index 72cf2ec6443..b60b25a0e4c 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -222,8 +222,6 @@ C_SOURCES := \ util/u_box.h \ util/u_cache.c \ util/u_cache.h \ - util/u_cpu_detect.c \ - util/u_cpu_detect.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 1b5eb4d155d..e1497992b17 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -242,8 +242,6 @@ files_libgallium = files( 'util/u_box.h', 'util/u_cache.c', 'util/u_cache.h', - 'util/u_cpu_detect.c', - 'util/u_cpu_detect.h', 'util/u_debug_gallium.h', 'util/u_debug_gallium.c', 'util/u_debug_describe.c', diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources index af2ad85da19..b4d23947ab7 100644 --- a/src/util/Makefile.sources +++ b/src/util/Makefile.sources @@ -70,6 +70,8 @@ MESA_UTIL_FILES := \ u_vector.h \ u_debug.c \ u_debug.h \ + u_cpu_detect.c \ + u_cpu_detect.h \ vma.c \ vma.h diff --git a/src/util/meson.build b/src/util/meson.build index 3b84f411112..7caea27d660 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -94,6 +94,8 @@ files_mesa_util = files( 'u_math.h', 'u_debug.c', 'u_debug.h', + 'u_cpu_detect.c', + 'u_cpu_detect.h', 'vma.c', 'vma.h', ) diff --git a/src/gallium/auxiliary/util/u_cpu_detect.c b/src/util/u_cpu_detect.c index 4dbb4d8fb58..4dbb4d8fb58 100644 --- a/src/gallium/auxiliary/util/u_cpu_detect.c +++ b/src/util/u_cpu_detect.c diff --git a/src/gallium/auxiliary/util/u_cpu_detect.h b/src/util/u_cpu_detect.h index efc910d1473..efc910d1473 100644 --- a/src/gallium/auxiliary/util/u_cpu_detect.h +++ b/src/util/u_cpu_detect.h |