From 3b48b7df1fb640cdf20fe1a016dcbb0d91c6d46d Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Wed, 24 Jan 2024 10:21:05 -0800 Subject: [PATCH] intel/blorp: Use a Meson dependency for blorp Reviewed-by: Dylan Baker Part-of: --- src/gallium/drivers/crocus/meson.build | 4 ++-- src/gallium/drivers/iris/meson.build | 5 +++-- src/intel/blorp/meson.build | 5 +++++ src/intel/vulkan/meson.build | 8 ++++---- src/intel/vulkan_hasvk/meson.build | 8 ++++---- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/gallium/drivers/crocus/meson.build b/src/gallium/drivers/crocus/meson.build index b2cd3c12988..4ac899113ad 100644 --- a/src/gallium/drivers/crocus/meson.build +++ b/src/gallium/drivers/crocus/meson.build @@ -80,10 +80,10 @@ libcrocus = static_library( c_args : [sse2_args], cpp_args : [sse2_args], gnu_symbol_visibility : 'hidden', - dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_libintel_common, idep_nir_headers, idep_intel_dev], + dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_libintel_common, idep_nir_headers, idep_intel_dev, idep_intel_blorp], link_with : [ crocus_per_hw_ver_libs, libintel_compiler, libisl, - libblorp, libintel_perf + libintel_perf ], ) diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build index 0ebed526c13..268935a55f7 100644 --- a/src/gallium/drivers/iris/meson.build +++ b/src/gallium/drivers/iris/meson.build @@ -99,10 +99,11 @@ libiris = static_library( cpp_args : [sse2_args], gnu_symbol_visibility : 'hidden', dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_nir_headers, - idep_libintel_common, idep_intel_driver_ds, idep_intel_dev], + idep_libintel_common, idep_intel_driver_ds, idep_intel_dev, + idep_intel_blorp], link_with : [ iris_per_hw_ver_libs, libintel_compiler, libisl, - libblorp, libintel_perf + libintel_perf ], ) diff --git a/src/intel/blorp/meson.build b/src/intel/blorp/meson.build index b7e70770060..18933c2a95f 100644 --- a/src/intel/blorp/meson.build +++ b/src/intel/blorp/meson.build @@ -35,4 +35,9 @@ libblorp = static_library( c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', dependencies : [idep_nir_headers, idep_genxml, idep_mesautil, idep_intel_dev], + build_by_default: false, +) + +idep_intel_blorp = declare_dependency( + link_with: libblorp, ) diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 79f13dd28b3..e2029d1e62c 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -254,13 +254,13 @@ libvulkan_intel = shared_library( ], link_whole : [libanv_common, libanv_per_hw_ver_libs] + optional_libgrl, link_with : [ - libintel_compiler, libisl, libblorp, libintel_perf, + libintel_compiler, libisl, libintel_perf, ], dependencies : [ dep_thread, dep_dl, dep_m, anv_deps, idep_libintel_common, idep_nir, idep_genxml, idep_vulkan_util, idep_vulkan_wsi, idep_vulkan_runtime, idep_mesautil, idep_xmlconfig, - idep_intel_driver_ds, idep_intel_dev, + idep_intel_driver_ds, idep_intel_dev, idep_intel_blorp, ], c_args : anv_flags, gnu_symbol_visibility : 'hidden', @@ -292,12 +292,12 @@ if with_tests link_whole : libanv_common, link_with : [ libanv_per_hw_ver_libs, libintel_compiler, libintel_common, - libisl, libblorp, libintel_perf, + libisl, libintel_perf, ] + optional_libgrl, dependencies : [ dep_thread, dep_dl, dep_m, anv_deps, idep_nir, idep_vulkan_util, idep_vulkan_wsi, idep_vulkan_runtime, - idep_mesautil, idep_intel_dev, idep_intel_shaders, + idep_mesautil, idep_intel_dev, idep_intel_shaders, idep_intel_blorp, ], c_args : anv_flags, gnu_symbol_visibility : 'hidden', diff --git a/src/intel/vulkan_hasvk/meson.build b/src/intel/vulkan_hasvk/meson.build index bedc1834e10..e9b4737175c 100644 --- a/src/intel/vulkan_hasvk/meson.build +++ b/src/intel/vulkan_hasvk/meson.build @@ -189,13 +189,13 @@ libvulkan_intel_hasvk = shared_library( ], link_whole : [libanv_hasvk_common, libanv_per_hw_ver_libs], link_with : [ - libintel_compiler, libisl, libblorp, libintel_perf, + libintel_compiler, libisl, libintel_perf, ], dependencies : [ dep_thread, dep_dl, dep_m, anv_deps, idep_libintel_common, idep_nir, idep_genxml, idep_vulkan_util, idep_vulkan_wsi, idep_vulkan_runtime, idep_mesautil, idep_xmlconfig, - idep_intel_driver_ds, idep_intel_dev, + idep_intel_driver_ds, idep_intel_dev, idep_intel_blorp, ], c_args : anv_flags, gnu_symbol_visibility : 'hidden', @@ -228,12 +228,12 @@ if with_tests link_whole : libanv_hasvk_common, link_with : [ libanv_per_hw_ver_libs, libintel_compiler, libintel_common, - libisl, libblorp, libintel_perf, + libisl, libintel_perf, ], dependencies : [ dep_thread, dep_dl, dep_m, anv_deps, idep_nir, idep_vulkan_util, idep_vulkan_wsi, idep_vulkan_runtime, - idep_mesautil, idep_intel_dev, + idep_mesautil, idep_intel_dev, idep_intel_blorp, ], c_args : anv_flags, gnu_symbol_visibility : 'hidden',