diff options
Diffstat (limited to 'src')
51 files changed, 124 insertions, 125 deletions
diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index b8e62e6617a..0ff6bbdbdd0 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -153,12 +153,12 @@ libvulkan_radeon = shared_library( ], link_with : [ libamd_common, libamdgpu_addrlib, libvulkan_wsi, - libmesa_util, libxmlconfig + libxmlconfig ], dependencies : [ dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl, dep_m, dep_valgrind, radv_deps, - idep_nir, idep_vulkan_util, idep_amdgfxregs_h, + idep_mesautil, idep_nir, idep_vulkan_util, idep_amdgfxregs_h, ], c_args : [c_vis_args, no_override_init_args, radv_flags], cpp_args : [cpp_vis_args, radv_flags], diff --git a/src/broadcom/drm-shim/meson.build b/src/broadcom/drm-shim/meson.build index 2c2e4c5eb2e..4fcc594add6 100644 --- a/src/broadcom/drm-shim/meson.build +++ b/src/broadcom/drm-shim/meson.build @@ -53,8 +53,8 @@ if dep_v3dv3.found() 'v3d.c', '../../gallium/drivers/v3d/v3d_simulator_wrapper.cpp', ], - dependencies: [dep_dl, dep_drm_shim, dep_v3dv3], - link_with: [libmesa_util, per_version_libs], + dependencies: [idep_mesautil, dep_dl, dep_drm_shim, dep_v3dv3], + link_with: per_version_libs, include_directories : [inc_common, inc_broadcom, inc_gallium_v3d], c_args : [c_vis_args, no_override_init_args, '-std=gnu99', v3dv3_c_args], cpp_args : [v3dv3_c_args] diff --git a/src/broadcom/qpu/meson.build b/src/broadcom/qpu/meson.build index 279b09cb95a..c9cf7b9e92b 100644 --- a/src/broadcom/qpu/meson.build +++ b/src/broadcom/qpu/meson.build @@ -39,7 +39,8 @@ test( 'qpu_disasm', executable( 'qpu_disasm', 'tests/qpu_disasm.c', - link_with: [libbroadcom_qpu, libmesa_util], + link_with: libbroadcom_qpu, + dependencies : idep_mesautil, include_directories: inc_common ), suite : ['broadcom'], diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build index 677baf1df10..5a665444f06 100644 --- a/src/compiler/glsl/glcpp/meson.build +++ b/src/compiler/glsl/glcpp/meson.build @@ -38,7 +38,7 @@ glcpp_lex = custom_target( libglcpp = static_library( 'glcpp', [glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c')], - link_with : libmesa_util, + dependencies : idep_mesautil, include_directories : [inc_common], c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args], diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build index fe1dc8ffe6a..ce6744eec66 100644 --- a/src/compiler/glsl/meson.build +++ b/src/compiler/glsl/meson.build @@ -240,8 +240,8 @@ libglsl_standalone = static_library( c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], cpp_args : [cpp_vis_args, cpp_msvc_compat_args], include_directories : [inc_common], - link_with : [libglsl, libglsl_util, libmesa_util], - dependencies : [dep_thread], + link_with : [libglsl, libglsl_util], + dependencies : [dep_thread, idep_mesautil], build_by_default : false, ) diff --git a/src/compiler/meson.build b/src/compiler/meson.build index 0f8f3c12966..81ca0269003 100644 --- a/src/compiler/meson.build +++ b/src/compiler/meson.build @@ -63,9 +63,8 @@ subdir('nir') spirv2nir = executable( 'spirv2nir', files('spirv/spirv2nir.c'), - dependencies : [dep_m, dep_thread, idep_nir], + dependencies : [dep_m, dep_thread, idep_nir, idep_mesautil], include_directories : [inc_common, inc_nir, include_directories('spirv')], - link_with : libmesa_util, c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], build_by_default : with_tools.contains('nir'), install : with_tools.contains('nir'), diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build index a54e899912f..dce8eabaab5 100644 --- a/src/compiler/nir/meson.build +++ b/src/compiler/nir/meson.build @@ -267,8 +267,7 @@ if with_tests files('tests/control_flow_tests.cpp'), cpp_args : [cpp_vis_args, cpp_msvc_compat_args], include_directories : [inc_common], - dependencies : [dep_thread, idep_gtest, idep_nir], - link_with : libmesa_util, + dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], ), suite : ['compiler', 'nir'], ) @@ -280,8 +279,7 @@ if with_tests files('tests/vars_tests.cpp'), cpp_args : [cpp_vis_args, cpp_msvc_compat_args], include_directories : [inc_common], - dependencies : [dep_thread, idep_gtest, idep_nir], - link_with : libmesa_util, + dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], ), suite : ['compiler', 'nir'], ) @@ -301,8 +299,7 @@ if with_tests files('tests/negative_equal_tests.cpp'), c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], include_directories : [inc_common], - dependencies : [dep_thread, idep_gtest, idep_nir], - link_with : libmesa_util, + dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], ) ) @@ -313,8 +310,7 @@ if with_tests files('tests/comparison_pre_tests.cpp'), c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args], include_directories : [inc_common], - dependencies : [dep_thread, idep_gtest, idep_nir], - link_with : libmesa_util, + dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil], ) ) endif diff --git a/src/drm-shim/meson.build b/src/drm-shim/meson.build index 1638c5ae728..ab05f9af035 100644 --- a/src/drm-shim/meson.build +++ b/src/drm-shim/meson.build @@ -24,9 +24,8 @@ drm_shim = static_library( 'device.c', 'drm_shim.c', ], - link_with: libmesa_util, include_directories: [inc_common], - dependencies: [dep_dl], + dependencies: [idep_mesautil, dep_dl], c_args : [c_vis_args, '-std=gnu99'], ) dep_drm_shim = declare_dependency( diff --git a/src/egl/meson.build b/src/egl/meson.build index b433ccb7600..f81f85b7e74 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -165,9 +165,9 @@ libegl = shared_library( '-D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_@0@'.format(egl_native_platform.to_upper()), ], include_directories : incs_for_egl, - link_with : [link_for_egl, libglapi, libmesa_util], + link_with : [link_for_egl, libglapi], link_args : [ld_args_bsymbolic, ld_args_gc_sections], - dependencies : [deps_for_egl, dep_dl, dep_libdrm, dep_clock, dep_thread], + dependencies : [deps_for_egl, dep_dl, dep_libdrm, dep_clock, dep_thread, idep_mesautil], install : true, version : egl_lib_version, ) diff --git a/src/etnaviv/drm/tests/meson.build b/src/etnaviv/drm/tests/meson.build index 41533d8cca2..cb3dce2e09d 100644 --- a/src/etnaviv/drm/tests/meson.build +++ b/src/etnaviv/drm/tests/meson.build @@ -30,8 +30,9 @@ etnaviv_cmd_stream_test = executable( dependencies : [ dep_libdrm, dep_valgrind, + idep_mesautil, ], - link_with : [libetnaviv_drm, libmesa_util], + link_with : libetnaviv_drm, install: false, ) @@ -47,7 +48,8 @@ etnaviv_bo_cache_test = executable( dependencies : [ dep_libdrm, dep_valgrind, + idep_mesautil, ], - link_with : [libetnaviv_drm, libmesa_util], + link_with : libetnaviv_drm, install: false, ) diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build index b14a4e70952..03079a14994 100644 --- a/src/freedreno/vulkan/meson.build +++ b/src/freedreno/vulkan/meson.build @@ -95,7 +95,6 @@ libvulkan_freedreno = shared_library( ], link_with : [ libvulkan_wsi, - libmesa_util, libfreedreno_drm, # required by ir3_shader_get_variant, which we don't use libfreedreno_ir3, ], @@ -110,6 +109,7 @@ libvulkan_freedreno = shared_library( idep_nir, tu_deps, idep_vulkan_util, + idep_mesautil, ], c_args : [c_vis_args, no_override_init_args, tu_flags], link_args : [ld_args_bsymbolic, ld_args_gc_sections], 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, ['@[email protected]'.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@.@[email protected]'.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, '@[email protected]'.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, '@[email protected]'.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. diff --git a/src/gbm/meson.build b/src/gbm/meson.build index 39fa0386a65..ff39d6962d0 100644 --- a/src/gbm/meson.build +++ b/src/gbm/meson.build @@ -49,8 +49,8 @@ libgbm = shared_library( include_directories : incs_gbm, c_args : [c_vis_args, args_gbm], link_args : [ld_args_gc_sections], - link_with : [libloader, libmesa_util, libxmlconfig], - dependencies : [deps_gbm, dep_dl, dep_thread], + link_with : [libloader, libxmlconfig], + dependencies : [deps_gbm, dep_dl, dep_thread, idep_mesautil], version : '1.0.0', install : true, ) diff --git a/src/glx/meson.build b/src/glx/meson.build index d7b4d086642..3079959145b 100644 --- a/src/glx/meson.build +++ b/src/glx/meson.build @@ -145,10 +145,10 @@ libglx = static_library( '-DGL_LIB_NAME="lib@[email protected].@1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]), ], link_with : [ - libloader, libloader_dri3_helper, libmesa_util, libxmlconfig, + libloader, libloader_dri3_helper, libxmlconfig, extra_libs_libglx, ], - dependencies : [dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd], + dependencies : [idep_mesautil, dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd], ) libgl = shared_library( diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build index 61fd35d5ef8..3d6a6de3853 100644 --- a/src/intel/common/meson.build +++ b/src/intel/common/meson.build @@ -58,8 +58,8 @@ if install_intel_gpu_tests '-DGEN_VERSIONx10=@0@'.format(g[0]) ], include_directories : [inc_common, inc_intel], - link_with : [libintel_dev, libmesa_util], - dependencies : [dep_libdrm, dep_thread, idep_gtest, idep_genxml], + link_with : [libintel_dev], + dependencies : [dep_libdrm, dep_thread, idep_gtest, idep_genxml, idep_mesautil], install : install_intel_gpu_tests, ) endforeach @@ -85,7 +85,8 @@ if with_tests 'genxml_test', ['tests/genxml_test.c', gentest_pack], include_directories : [inc_common, inc_intel], - link_with : [libintel_common, libmesa_util], + dependencies : idep_mesautil, + link_with : libintel_common, c_args : [ '-DGENXML_PATH="@0@"'.format(genxml_path) ], diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build index e6fa551ecdd..51bad505016 100644 --- a/src/intel/compiler/meson.build +++ b/src/intel/compiler/meson.build @@ -155,9 +155,9 @@ if with_tests 'test_@[email protected]'.format(t), include_directories : [inc_common, inc_intel], link_with : [ - libintel_compiler, libintel_common, libintel_dev, libmesa_util, libisl, + libintel_compiler, libintel_common, libintel_dev, libisl, ], - dependencies : [dep_thread, dep_dl, idep_gtest, idep_nir], + dependencies : [dep_thread, dep_dl, idep_gtest, idep_nir, idep_mesautil], ), suite : ['intel'], ) diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build index 9117afb4228..88070749879 100644 --- a/src/intel/isl/meson.build +++ b/src/intel/isl/meson.build @@ -126,9 +126,9 @@ if with_tests executable( 'isl_surf_get_image_offset_test', 'tests/isl_surf_get_image_offset_test.c', - dependencies : dep_m, + dependencies : [dep_m, idep_mesautil], include_directories : [inc_common, inc_intel], - link_with : [libisl, libintel_dev, libmesa_util], + link_with : [libisl, libintel_dev], ), suite : ['intel'], ) diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build index b0598f39ab5..647b77f5054 100644 --- a/src/intel/tools/meson.build +++ b/src/intel/tools/meson.build @@ -22,7 +22,8 @@ libaub = static_library( 'aub', files('aub_read.c', 'aub_mem.c'), include_directories : [inc_common, inc_intel], - link_with : [libintel_common, libintel_dev, libmesa_util], + dependencies : idep_mesautil, + link_with : [libintel_common, libintel_dev], c_args : [c_vis_args, no_override_init_args], install : false ) @@ -30,9 +31,9 @@ libaub = static_library( aubinator = executable( 'aubinator', files('aubinator.c'), - dependencies : [dep_expat, dep_zlib, dep_dl, dep_thread, dep_m], + dependencies : [idep_mesautil, dep_expat, dep_zlib, dep_dl, dep_thread, dep_m], include_directories : [inc_common, inc_intel], - link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util, libaub], + link_with : [libintel_common, libintel_compiler, libintel_dev, libaub], c_args : [c_vis_args, no_override_init_args], install : true ) @@ -40,9 +41,9 @@ aubinator = executable( aubinator_error_decode = executable( 'aubinator_error_decode', files('aubinator_error_decode.c'), - dependencies : [dep_zlib, dep_thread], + dependencies : [idep_mesautil, dep_zlib, dep_thread], include_directories : [inc_common, inc_intel], - link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util], + link_with : [libintel_common, libintel_compiler, libintel_dev], c_args : [c_vis_args, no_override_init_args], install : true ) @@ -50,9 +51,9 @@ aubinator_error_decode = executable( i965_disasm = executable( 'i965_disasm', files('i965_disasm.c'), - dependencies : [dep_thread], + dependencies : [idep_mesautil, dep_thread], include_directories : [inc_common, inc_intel], - link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util], + link_with : [libintel_common, libintel_compiler, libintel_dev], c_args : [c_vis_args, no_override_init_args], install : true ) @@ -83,9 +84,9 @@ configure_file( libintel_sanitize_gpu = shared_library( 'intel_sanitize_gpu', files('intel_sanitize_gpu.c'), - dependencies : [dep_dl, dep_thread], + dependencies : [idep_mesautil, dep_dl, dep_thread], include_directories : [inc_common, inc_intel, inc_include], - link_with : [libintel_common, libmesa_util], + link_with : libintel_common, c_args : [c_vis_args, no_override_init_args, c_sse2_args], install_dir : get_option('libexecdir'), install : true @@ -119,9 +120,9 @@ if with_tools.contains('intel-ui') aubinator_viewer = executable( 'aubinator_viewer', files('aubinator_viewer.cpp', 'aubinator_viewer_decoder.cpp'), - dependencies : [dep_zlib, dep_dl, dep_thread, dep_m, libintel_imgui_gtk_dep], + dependencies : [idep_mesautil, dep_zlib, dep_dl, dep_thread, dep_m, libintel_imgui_gtk_dep], include_directories : [inc_common, inc_intel], - link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util, libaub], + link_with : [libintel_common, libintel_compiler, libintel_dev, libaub], c_args : [c_vis_args, no_override_init_args], cpp_args : ['-fpermissive', '-Wno-parentheses', '-Wno-class-memaccess'], install : true @@ -148,9 +149,9 @@ i965_lex_yy_c = custom_target( i965_asm = executable( 'i965_asm', ['i965_asm.c', i965_gram_tab[0], i965_gram_tab[1], i965_lex_yy_c], - dependencies : [dep_thread], + dependencies : [idep_mesautil, dep_thread], include_directories : [inc_common, inc_intel], - link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util], + link_with : [libintel_common, libintel_compiler, libintel_dev], c_args : [c_vis_args, no_override_init_args], install : true ) diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 8b102ffe7d2..c1558b79439 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -194,10 +194,11 @@ libvulkan_intel = shared_library( link_whole : [libanv_common, libanv_gen_libs], link_with : [ libintel_compiler, libintel_common, libintel_dev, libisl, libblorp, - libvulkan_wsi, libmesa_util, + libvulkan_wsi, ], dependencies : [ - dep_thread, dep_dl, dep_m, anv_deps, idep_nir, idep_genxml, idep_vulkan_util + dep_thread, dep_dl, dep_m, anv_deps, + idep_nir, idep_genxml, idep_vulkan_util, idep_mesautil, ], c_args : anv_flags, link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic, ld_args_gc_sections], @@ -214,10 +215,11 @@ if with_tests link_whole : libanv_common, link_with : [ libanv_gen_libs, libintel_compiler, libintel_common, libintel_dev, - libisl, libblorp, libvulkan_wsi, libmesa_util, + libisl, libblorp, libvulkan_wsi, ], dependencies : [ - dep_thread, dep_dl, dep_m, anv_deps, idep_nir, idep_vulkan_util + dep_thread, dep_dl, dep_m, anv_deps, + idep_nir, idep_vulkan_util, idep_mesautil, ], c_args : anv_flags, ) diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build index d69acf1f75a..1614744bdc5 100644 --- a/src/mesa/drivers/dri/meson.build +++ b/src/mesa/drivers/dri/meson.build @@ -59,11 +59,12 @@ if _dri_drivers != [] [], link_whole : _dri_drivers, link_with : [ - libmegadriver_stub, libdricommon, libglapi, libmesa_util, + libmegadriver_stub, libdricommon, libglapi, libmesa_classic, ], dependencies : [ - dep_selinux, dep_libdrm, dep_m, dep_thread, dep_dl, idep_nir, idep_xmlconfig, + dep_selinux, dep_libdrm, dep_m, dep_thread, dep_dl, + idep_nir, idep_xmlconfig, idep_mesautil, ], link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections], # Will be deleted during installation, see install_megadrivers.py diff --git a/src/mesa/drivers/x11/meson.build b/src/mesa/drivers/x11/meson.build index cb092d25d6c..e828566b4cf 100644 --- a/src/mesa/drivers/x11/meson.build +++ b/src/mesa/drivers/x11/meson.build @@ -32,8 +32,8 @@ libgl = shared_library( include_directories : [ inc_include, inc_src, inc_mesa, inc_mapi, inc_gallium, inc_gallium_aux ], - link_with : [libmesa_classic, libglapi_static, libmesa_util, gl_link_with], - dependencies : [dep_x11, dep_xext, dep_xcb, dep_thread], + link_with : [libmesa_classic, libglapi_static, gl_link_with], + dependencies : [idep_mesautil, dep_x11, dep_xext, dep_xcb, dep_thread], version : '1.6.0', install : true, ) diff --git a/src/mesa/state_tracker/tests/meson.build b/src/mesa/state_tracker/tests/meson.build index 441de8d2796..d550f01c7fc 100644 --- a/src/mesa/state_tracker/tests/meson.build +++ b/src/mesa/state_tracker/tests/meson.build @@ -33,9 +33,8 @@ test( include_directories : inc_common, link_with : [ libmesa_st_test_common, libmesa_gallium, libglapi, libgallium, - libmesa_util, ], - dependencies : dep_thread, + dependencies : [dep_thread, idep_mesautil], ), suite : ['st_mesa'], ) @@ -48,9 +47,8 @@ test( include_directories : inc_common, link_with : [ libmesa_st_test_common, libmesa_gallium, libglapi, libgallium, - libmesa_util, ], - dependencies : [idep_gtest, dep_thread], + dependencies : [idep_mesautil, idep_gtest, dep_thread], ), suite : ['st_mesa'], ) @@ -63,9 +61,8 @@ test( include_directories : inc_common, link_with : [ libmesa_st_test_common, libmesa_gallium, libglapi, libgallium, - libmesa_util, ], - dependencies : [idep_gtest, dep_thread] + dependencies : [idep_mesautil, idep_gtest, dep_thread], ), suite : ['st_mesa'], ) diff --git a/src/panfrost/meson.build b/src/panfrost/meson.build index 9c12ff8fd8e..435c64d354a 100644 --- a/src/panfrost/meson.build +++ b/src/panfrost/meson.build @@ -49,9 +49,7 @@ pandecode = executable( include_directories : [inc_common, inc_include, inc_src, inc_panfrost], dependencies : [ dep_thread, - ], - link_with : [ - libmesa_util + idep_mesautil, ], build_by_default : true ) @@ -71,11 +69,11 @@ bifrost_compiler = executable( ], dependencies : [ dep_thread, - idep_nir + idep_nir, + idep_mesautil, ], link_with : [ libglsl_standalone, - libmesa_util, libpanfrost_bifrost ], build_by_default : true diff --git a/src/util/meson.build b/src/util/meson.build index 8aa7af921e1..d3c186366fb 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -132,7 +132,7 @@ format_srgb = custom_target( capture : true, ) -libmesa_util = static_library( +_libmesa_util = static_library( 'mesa_util', [files_mesa_util, format_srgb], include_directories : inc_common, @@ -141,12 +141,17 @@ libmesa_util = static_library( build_by_default : false ) +idep_mesautil = declare_dependency( + link_with : _libmesa_util, + include_directories : inc_util, + dependencies : [dep_zlib, dep_clock, dep_thread, dep_atomic, dep_m], +) + libxmlconfig = static_library( 'xmlconfig', files_xmlconfig, include_directories : inc_common, - link_with : libmesa_util, - dependencies : [dep_expat, dep_m], + dependencies : [idep_mesautil, dep_expat, dep_m], c_args : [ c_msvc_compat_args, c_vis_args, '-DSYSCONFDIR="@0@"'.format( @@ -173,7 +178,7 @@ if with_tests 'u_atomic_test', files('u_atomic_test.c'), include_directories : inc_common, - link_with : libmesa_util, + dependencies : idep_mesautil, c_args : [c_msvc_compat_args], ), suite : ['util'], @@ -197,7 +202,7 @@ if with_tests 'mesa-sha1_test', files('mesa-sha1_test.c'), include_directories : inc_common, - link_with : libmesa_util, + dependencies : idep_mesautil, c_args : [c_msvc_compat_args], ), suite : ['util'], @@ -209,8 +214,7 @@ if with_tests 'bitset_test', files('bitset_test.cpp'), include_directories : inc_common, - dependencies : [dep_thread, dep_dl, idep_gtest], - link_with : libmesa_util, + dependencies : [idep_mesautil, dep_thread, dep_dl, idep_gtest], ), suite : ['util'], ) diff --git a/src/util/tests/fast_idiv_by_const/meson.build b/src/util/tests/fast_idiv_by_const/meson.build index 90ac7d15972..2caeabd287d 100644 --- a/src/util/tests/fast_idiv_by_const/meson.build +++ b/src/util/tests/fast_idiv_by_const/meson.build @@ -23,9 +23,8 @@ test( executable( 'fast_idiv_by_const_test', 'fast_idiv_by_const_test.cpp', - dependencies : [dep_thread, dep_dl, idep_gtest], + dependencies : [dep_thread, dep_dl, idep_gtest, idep_mesautil], include_directories : inc_common, - link_with : [libmesa_util], ), suite : ['util'], ) diff --git a/src/util/tests/fast_urem_by_const/meson.build b/src/util/tests/fast_urem_by_const/meson.build index 8bae51f0a83..58299b0ebf9 100644 --- a/src/util/tests/fast_urem_by_const/meson.build +++ b/src/util/tests/fast_urem_by_const/meson.build @@ -24,9 +24,8 @@ test( executable( 'fast_urem_by_const_test', 'fast_urem_by_const_test.cpp', - dependencies : [dep_thread, dep_dl, idep_gtest], + dependencies : [dep_thread, dep_dl, idep_gtest, idep_mesautil], include_directories : inc_common, - link_with : [libmesa_util], ), suite : ['util'], ) diff --git a/src/util/tests/hash_table/meson.build b/src/util/tests/hash_table/meson.build index 1ad3be3d063..54b7774dd3a 100644 --- a/src/util/tests/hash_table/meson.build +++ b/src/util/tests/hash_table/meson.build @@ -28,9 +28,8 @@ foreach t : ['clear', 'collision', 'delete_and_lookup', 'delete_management', '@0@_test'.format(t), files('@[email protected]'.format(t)), c_args : [c_msvc_compat_args], - dependencies : [dep_thread, dep_dl], + dependencies : [dep_thread, dep_dl, idep_mesautil], include_directories : [inc_include, inc_util], - link_with : libmesa_util, ), suite : ['util'], ) diff --git a/src/util/tests/set/meson.build b/src/util/tests/set/meson.build index 5ab180c11eb..9d0d311ba5e 100644 --- a/src/util/tests/set/meson.build +++ b/src/util/tests/set/meson.build @@ -23,9 +23,8 @@ test( executable( 'set_test', 'set_test.cpp', - dependencies : [dep_thread, dep_dl, idep_gtest], + dependencies : [dep_thread, dep_dl, idep_gtest, idep_mesautil], include_directories : inc_common, - link_with : [libmesa_util], ), suite : ['util'], ) diff --git a/src/util/tests/string_buffer/meson.build b/src/util/tests/string_buffer/meson.build index f4e1a8e24e6..9ab25179ec3 100644 --- a/src/util/tests/string_buffer/meson.build +++ b/src/util/tests/string_buffer/meson.build @@ -23,9 +23,8 @@ test( executable( 'string_buffer_test', 'string_buffer_test.cpp', - dependencies : [dep_thread, dep_dl, idep_gtest], + dependencies : [dep_thread, dep_dl, idep_gtest, idep_mesautil], include_directories : inc_common, - link_with : [libmesa_util], ), suite : ['util'], ) diff --git a/src/util/tests/timespec/meson.build b/src/util/tests/timespec/meson.build index aa801bee188..c685db5fd99 100644 --- a/src/util/tests/timespec/meson.build +++ b/src/util/tests/timespec/meson.build @@ -23,9 +23,8 @@ test( executable( 'timespec_test', 'timespec_test.cpp', - dependencies : [dep_thread, dep_dl, idep_gtest], + dependencies : [dep_thread, dep_dl, idep_gtest, idep_mesautil], include_directories : inc_common, - link_with : [libmesa_util], ), suite : ['util'], ) diff --git a/src/util/tests/vma/meson.build b/src/util/tests/vma/meson.build index 22137eb671e..1239c7b046a 100644 --- a/src/util/tests/vma/meson.build +++ b/src/util/tests/vma/meson.build @@ -24,7 +24,7 @@ test( 'vma_random_test', 'vma_random_test.cpp', include_directories : [inc_include, inc_util], - link_with : [libmesa_util], + dependencies : idep_mesautil, ), suite : ['util'], ) diff --git a/src/vulkan/overlay-layer/meson.build b/src/vulkan/overlay-layer/meson.build index 326e2004b53..96134d356ff 100644 --- a/src/vulkan/overlay-layer/meson.build +++ b/src/vulkan/overlay-layer/meson.build @@ -41,10 +41,9 @@ vklayer_mesa_overlay = shared_library( vklayer_files, overlay_spv, c_args : [c_vis_args, no_override_init_args, vulkan_wsi_args], cpp_args : [cpp_vis_args, vulkan_wsi_args], - dependencies : [idep_vulkan_util, vulkan_wsi_deps, libimgui_core_dep, dep_dl], + dependencies : [idep_vulkan_util, idep_mesautil, vulkan_wsi_deps, libimgui_core_dep, dep_dl], include_directories : inc_common, link_args : cc.get_supported_link_arguments(['-Wl,-Bsymbolic-functions', '-Wl,-z,relro']), - link_with : libmesa_util, install : true ) |