summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@intel.com>2019-07-22 14:50:15 +0100
committerEric Engestrom <eric@engestrom.ch>2019-08-03 00:08:37 +0000
commitd2d85b950d78c553b2694cda9ef0cc7bf9a0f737 (patch)
treeafdd28e30b66064b8b540a6e9d6d0ecbe27a6678 /src/gallium
parent8ddb38209d51c53d6e5792b04b97814dfce9bce6 (diff)
meson: replace libmesa_util with idep_mesautil
This automates the include_directories and dependencies tracking so that all users of libmesa_util don't need to add them manually. Next commit will remove the ones that were only added for that reason. Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Acked-by: Eric Anholt <eric@anholt.net> Tested-by: Vinson Lee <vlee@freedesktop.org>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/etnaviv/meson.build4
-rw-r--r--src/gallium/drivers/freedreno/meson.build2
-rw-r--r--src/gallium/drivers/lima/meson.build2
-rw-r--r--src/gallium/drivers/llvmpipe/meson.build4
-rw-r--r--src/gallium/drivers/nouveau/meson.build4
-rw-r--r--src/gallium/drivers/r300/meson.build4
-rw-r--r--src/gallium/targets/d3dadapter9/meson.build4
-rw-r--r--src/gallium/targets/graw-null/meson.build3
-rw-r--r--src/gallium/targets/graw-xlib/meson.build4
-rw-r--r--src/gallium/targets/haiku-softpipe/meson.build4
-rw-r--r--src/gallium/targets/omx/meson.build4
-rw-r--r--src/gallium/targets/opencl/meson.build3
-rw-r--r--src/gallium/targets/pipe-loader/meson.build4
-rw-r--r--src/gallium/targets/va/meson.build3
-rw-r--r--src/gallium/targets/vdpau/meson.build5
-rw-r--r--src/gallium/targets/xa/meson.build5
-rw-r--r--src/gallium/targets/xvmc/meson.build4
-rw-r--r--src/gallium/tests/graw/meson.build4
-rw-r--r--src/gallium/tests/trivial/meson.build4
-rw-r--r--src/gallium/tests/unit/meson.build4
20 files changed, 40 insertions, 35 deletions
diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build
index c84f4449c63..c53eab16540 100644
--- a/src/gallium/drivers/etnaviv/meson.build
+++ b/src/gallium/drivers/etnaviv/meson.build
@@ -106,10 +106,10 @@ etnaviv_compiler = executable(
include_directories : [
inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_etnaviv,
],
- link_with : [libmesa_util, libgallium, libetnaviv, libetnaviv_drm],
+ link_with : [libgallium, libetnaviv, libetnaviv_drm],
build_by_default : with_tools.contains('etnaviv'),
install : with_tools.contains('etnaviv'),
- dependencies : dep_libdrm,
+ dependencies : [idep_mesautil, dep_libdrm],
)
driver_etnaviv = declare_dependency(
diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build
index c0dcc1ea316..d1a021537b8 100644
--- a/src/gallium/drivers/freedreno/meson.build
+++ b/src/gallium/drivers/freedreno/meson.build
@@ -256,6 +256,7 @@ ir3_compiler = executable(
dependencies : [
dep_thread,
idep_nir,
+ idep_mesautil,
],
link_with : [
libfreedreno,
@@ -263,7 +264,6 @@ ir3_compiler = executable(
libfreedreno_ir3,
libgallium,
libglsl_standalone,
- libmesa_util,
],
build_by_default : with_tools.contains('freedreno'),
install : with_tools.contains('freedreno'),
diff --git a/src/gallium/drivers/lima/meson.build b/src/gallium/drivers/lima/meson.build
index 0f13b9c7272..27e5ac00142 100644
--- a/src/gallium/drivers/lima/meson.build
+++ b/src/gallium/drivers/lima/meson.build
@@ -99,12 +99,12 @@ lima_compiler = executable(
dependencies : [
dep_thread,
idep_nir,
+ idep_mesautil,
],
link_with : [
liblima,
libgallium,
libglsl_standalone,
- libmesa_util,
libpanfrost_shared,
],
build_by_default : with_tools.contains('lima'),
diff --git a/src/gallium/drivers/llvmpipe/meson.build b/src/gallium/drivers/llvmpipe/meson.build
index 51562b10dc7..806839df190 100644
--- a/src/gallium/drivers/llvmpipe/meson.build
+++ b/src/gallium/drivers/llvmpipe/meson.build
@@ -116,9 +116,9 @@ if with_tests and with_gallium_softpipe and with_llvm
executable(
t,
['@0@.c'.format(t), 'lp_test_main.c'],
- dependencies : [dep_llvm, dep_dl, dep_thread, dep_clock],
+ dependencies : [dep_llvm, dep_dl, dep_thread, dep_clock, idep_mesautil],
include_directories : [inc_gallium, inc_gallium_aux, inc_include, inc_src],
- link_with : [libllvmpipe, libgallium, libmesa_util],
+ link_with : [libllvmpipe, libgallium],
),
suite : ['llvmpipe'],
)
diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build
index b3e79bf7089..9369777de83 100644
--- a/src/gallium/drivers/nouveau/meson.build
+++ b/src/gallium/drivers/nouveau/meson.build
@@ -223,8 +223,8 @@ nouveau_compiler = executable(
'nouveau_compiler',
'nouveau_compiler.c',
include_directories : [inc_src, inc_include, inc_gallium, inc_gallium_aux],
- dependencies : [dep_libdrm, dep_libdrm_nouveau],
- link_with : [libnouveau, libgallium, libmesa_util, libnir],
+ dependencies : [dep_libdrm, dep_libdrm_nouveau, idep_mesautil],
+ link_with : [libnouveau, libgallium, libnir],
build_by_default : with_tools.contains('nouveau'),
install : with_tools.contains('nouveau'),
)
diff --git a/src/gallium/drivers/r300/meson.build b/src/gallium/drivers/r300/meson.build
index f46aedffdfe..6fcafe54034 100644
--- a/src/gallium/drivers/r300/meson.build
+++ b/src/gallium/drivers/r300/meson.build
@@ -156,8 +156,8 @@ if with_tests
inc_src, inc_include, inc_gallium, inc_gallium_aux,
include_directories('compiler'),
],
- link_with : [libr300, libgallium, libmesa_util],
- dependencies : [dep_m, dep_clock, dep_dl, dep_thread, dep_unwind],
+ link_with : [libr300, libgallium],
+ dependencies : [dep_m, dep_clock, dep_dl, dep_thread, dep_unwind, idep_mesautil],
),
suite : ['r300'],
)
diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build
index e5b313c00df..2ce9ecd6fc1 100644
--- a/src/gallium/targets/d3dadapter9/meson.build
+++ b/src/gallium/targets/d3dadapter9/meson.build
@@ -48,12 +48,12 @@ libgallium_nine = shared_library(
link_args : [ld_args_gc_sections, gallium_nine_ld_args],
link_depends : gallium_nine_link_depends,
link_with : [
- libgalliumvl_stub, libgallium, libnine_st, libmesa_util,
+ libgalliumvl_stub, libgallium, libnine_st,
libpipe_loader_static, libws_null, libwsw, libswdri,
libswkmsdri, libnir,
],
dependencies : [
- dep_selinux, dep_libdrm, dep_llvm, dep_thread, idep_xmlconfig,
+ dep_selinux, dep_libdrm, dep_llvm, dep_thread, idep_xmlconfig, idep_mesautil,
driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
driver_i915, driver_svga, driver_iris
],
diff --git a/src/gallium/targets/graw-null/meson.build b/src/gallium/targets/graw-null/meson.build
index 8a294f41307..8bffbeaf7c8 100644
--- a/src/gallium/targets/graw-null/meson.build
+++ b/src/gallium/targets/graw-null/meson.build
@@ -28,7 +28,8 @@ libgraw_null = shared_library(
'graw_null',
['graw_null.c'],
include_directories : inc_common,
- link_with : [libmesa_util, libgallium],
+ link_with : libgallium,
+ dependencies : idep_mesautil,
)
libgraw = libgraw_null
diff --git a/src/gallium/targets/graw-xlib/meson.build b/src/gallium/targets/graw-xlib/meson.build
index aab99ba64c1..6501daaa2d5 100644
--- a/src/gallium/targets/graw-xlib/meson.build
+++ b/src/gallium/targets/graw-xlib/meson.build
@@ -23,9 +23,9 @@ libgraw_xlib = shared_library(
['graw_xlib.c'],
include_directories : [inc_common, inc_gallium_drivers, inc_gallium_winsys],
link_with : [
- libgraw_util, libmesa_util, libgallium, libws_xlib
+ libgraw_util, libgallium, libws_xlib
],
- dependencies : [dep_thread, driver_swrast],
+ dependencies : [idep_mesautil, dep_thread, driver_swrast],
version : '1.0',
)
diff --git a/src/gallium/targets/haiku-softpipe/meson.build b/src/gallium/targets/haiku-softpipe/meson.build
index 619706d818d..139eb79a79d 100644
--- a/src/gallium/targets/haiku-softpipe/meson.build
+++ b/src/gallium/targets/haiku-softpipe/meson.build
@@ -30,11 +30,11 @@ libswpipe = shared_library(
cpp_args : [cpp_vis_args],
link_args : [ld_args_bsymbolic, ld_args_gc_sections],
link_with : [
- libglapi, libswhgl, libsthgl, libmesa_util, libcompiler,
+ libglapi, libswhgl, libsthgl, libcompiler,
libmesa_gallium, libglsl, libnir, libgallium, libgl
],
dependencies : [
driver_swrast, cpp.find_library('be'), cpp.find_library('translation'),
- cpp.find_library('network'), dep_unwind
+ cpp.find_library('network'), dep_unwind, idep_mesautil,
]
)
diff --git a/src/gallium/targets/omx/meson.build b/src/gallium/targets/omx/meson.build
index 7772ae47bb5..0a748106b5c 100644
--- a/src/gallium/targets/omx/meson.build
+++ b/src/gallium/targets/omx/meson.build
@@ -41,11 +41,11 @@ libomx_gallium = shared_library(
],
link_whole : [libomx_st],
link_with : [
- libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
+ libgalliumvlwinsys, libgalliumvl, libgallium,
libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
],
link_depends : omx_link_depends,
- dependencies : [dep_thread, driver_r600, driver_radeonsi, driver_nouveau],
+ dependencies : [dep_thread, idep_mesautil, driver_r600, driver_radeonsi, driver_nouveau],
install : true,
install_dir : omx_drivers_path,
)
diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
index 650a2054cfb..dd97c91b1f6 100644
--- a/src/gallium/targets/opencl/meson.build
+++ b/src/gallium/targets/opencl/meson.build
@@ -39,8 +39,9 @@ libopencl = shared_library(
link_args : [ld_args_gc_sections, opencl_link_args],
link_depends : opencl_link_deps,
link_whole : libclover,
- link_with : [libpipe_loader_dynamic, libgallium, libmesa_util],
+ link_with : [libpipe_loader_dynamic, libgallium],
dependencies : [
+ idep_mesautil,
dep_thread, dep_clock, dep_dl, dep_unwind, dep_elf, dep_expat,
cpp.find_library('clangCodeGen', dirs : llvm_libdir),
cpp.find_library('clangFrontendTool', dirs : llvm_libdir),
diff --git a/src/gallium/targets/pipe-loader/meson.build b/src/gallium/targets/pipe-loader/meson.build
index e9454d5666a..045eb4174a7 100644
--- a/src/gallium/targets/pipe-loader/meson.build
+++ b/src/gallium/targets/pipe-loader/meson.build
@@ -20,7 +20,7 @@
pipe_loader_link_args = [ld_args_gc_sections]
pipe_loader_link_deps = []
-pipe_loader_link_with = [libgallium, libnir, libmesa_util]
+pipe_loader_link_with = [libgallium, libnir]
pipe_loader_comp_args = []
pipe_loader_incs = [
inc_include, inc_src, inc_util, inc_gallium, inc_gallium_drivers,
@@ -69,7 +69,7 @@ foreach x : pipe_loaders
link_depends : pipe_loader_link_deps,
include_directories : pipe_loader_incs,
link_with : [pipe_loader_link_with, x[3]],
- dependencies : [dep_thread, x[2]],
+ dependencies : [idep_mesautil, dep_thread, x[2]],
name_prefix : '',
install : true,
install_dir : pipe_loader_install_dir,
diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build
index 4bfb5cbab7a..3240c66b648 100644
--- a/src/gallium/targets/va/meson.build
+++ b/src/gallium/targets/va/meson.build
@@ -42,11 +42,12 @@ libva_gallium = shared_library(
],
link_whole : [libva_st],
link_with : [
- libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
+ libgalliumvlwinsys, libgalliumvl, libgallium,
libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
],
dependencies : [
dep_libdrm, dep_thread, driver_r600, driver_radeonsi, driver_nouveau,
+ idep_mesautil,
],
link_depends : va_link_depends,
# Will be deleted during installation, see install_megadrivers.py
diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build
index 48f01ffba6c..3f001aaa5d0 100644
--- a/src/gallium/targets/vdpau/meson.build
+++ b/src/gallium/targets/vdpau/meson.build
@@ -47,11 +47,12 @@ libvdpau_gallium = shared_library(
],
link_whole : [libvdpau_st],
link_with : [
- libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
+ libgalliumvlwinsys, libgalliumvl, libgallium,
libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
],
dependencies : [
- dep_thread, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
+ dep_thread, idep_mesautil,
+ driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
],
link_depends : vdpau_link_depends,
soversion : '@0@.@1@.0'.format(VDPAU_MAJOR, VDPAU_MINOR),
diff --git a/src/gallium/targets/xa/meson.build b/src/gallium/targets/xa/meson.build
index 582d5ef67f6..2e334262bac 100644
--- a/src/gallium/targets/xa/meson.build
+++ b/src/gallium/targets/xa/meson.build
@@ -43,12 +43,13 @@ libxatracker = shared_library(
],
link_whole : [libxa_st],
link_with : [
- libgalliumvl_stub, libgallium, libmesa_util, libpipe_loader_static,
+ libgalliumvl_stub, libgallium, libpipe_loader_static,
libws_null, libwsw, libswdri, libswkmsdri,
],
link_depends : xa_link_depends,
dependencies : [
- dep_thread, driver_nouveau, driver_i915, driver_svga, driver_freedreno,
+ dep_thread, idep_mesautil,
+ driver_nouveau, driver_i915, driver_svga, driver_freedreno,
],
version : _xa_version,
install : true,
diff --git a/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build
index 537275aab57..e358c91e46c 100644
--- a/src/gallium/targets/xvmc/meson.build
+++ b/src/gallium/targets/xvmc/meson.build
@@ -42,10 +42,10 @@ libxvmc_gallium = shared_library(
],
link_whole : [libxvmc_st],
link_with : [
- libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
+ libgalliumvlwinsys, libgalliumvl, libgallium,
libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
],
- dependencies : [dep_thread, driver_r600, driver_nouveau],
+ dependencies : [dep_thread, idep_mesautil, driver_r600, driver_nouveau],
link_depends : xvmc_link_depends,
# Will be deleted during installation, see install_megadrivers.py
install : true,
diff --git a/src/gallium/tests/graw/meson.build b/src/gallium/tests/graw/meson.build
index fd416c16287..f8ed2bce3bc 100644
--- a/src/gallium/tests/graw/meson.build
+++ b/src/gallium/tests/graw/meson.build
@@ -30,7 +30,7 @@ foreach t : progs
'graw-' + t,
t + '.c',
include_directories : inc_common,
- link_with : [libgraw, libgraw_util, libmesa_util, libgallium],
- dependencies : [dep_m, dep_thread]
+ link_with : [libgraw, libgraw_util, libgallium],
+ dependencies : [dep_m, dep_thread, idep_mesautil],
)
endforeach
diff --git a/src/gallium/tests/trivial/meson.build b/src/gallium/tests/trivial/meson.build
index 1f912d5aa46..7d8d430a7e2 100644
--- a/src/gallium/tests/trivial/meson.build
+++ b/src/gallium/tests/trivial/meson.build
@@ -23,8 +23,8 @@ foreach t : ['compute', 'tri', 'quad-tex']
t,
'@0@.c'.format(t),
include_directories : inc_common,
- link_with : [libmesa_util, libgallium, libpipe_loader_dynamic],
- dependencies : dep_thread,
+ link_with : [libgallium, libpipe_loader_dynamic],
+ dependencies : [idep_mesautil, dep_thread],
install : false,
)
endforeach
diff --git a/src/gallium/tests/unit/meson.build b/src/gallium/tests/unit/meson.build
index eacbd39b882..75ad10852fc 100644
--- a/src/gallium/tests/unit/meson.build
+++ b/src/gallium/tests/unit/meson.build
@@ -24,8 +24,8 @@ foreach t : ['pipe_barrier_test', 'u_cache_test', 'u_half_test',
t,
'@0@.c'.format(t),
include_directories : inc_common,
- link_with : [libgallium, libmesa_util],
- dependencies : [dep_thread],
+ link_with : libgallium,
+ dependencies : [idep_mesautil, dep_thread],
install : false,
)
# u_cache_test is slow, and translate_test fails.