diff options
-rw-r--r-- | src/gallium/drivers/crocus/meson.build | 4 | ||||
-rw-r--r-- | src/gallium/drivers/iris/meson.build | 4 | ||||
-rw-r--r-- | src/gallium/winsys/crocus/drm/meson.build | 2 | ||||
-rw-r--r-- | src/intel/blorp/meson.build | 2 | ||||
-rw-r--r-- | src/intel/common/meson.build | 8 | ||||
-rw-r--r-- | src/intel/compiler/meson.build | 10 | ||||
-rw-r--r-- | src/intel/dev/meson.build | 16 | ||||
-rw-r--r-- | src/intel/ds/meson.build | 8 | ||||
-rw-r--r-- | src/intel/isl/meson.build | 15 | ||||
-rw-r--r-- | src/intel/perf/meson.build | 5 | ||||
-rw-r--r-- | src/intel/tools/meson.build | 34 | ||||
-rw-r--r-- | src/intel/vulkan/meson.build | 10 | ||||
-rw-r--r-- | src/intel/vulkan_hasvk/meson.build | 8 |
13 files changed, 64 insertions, 62 deletions
diff --git a/src/gallium/drivers/crocus/meson.build b/src/gallium/drivers/crocus/meson.build index 89c9d5e7fae..541adda4da1 100644 --- a/src/gallium/drivers/crocus/meson.build +++ b/src/gallium/drivers/crocus/meson.build @@ -80,9 +80,9 @@ 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], + dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_libintel_common, idep_nir_headers,], link_with : [ - crocus_per_hw_ver_libs, libintel_compiler, libintel_dev, libisl, + crocus_per_hw_ver_libs, libintel_compiler, libisl, libblorp, libintel_perf ], ) diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build index 97413cc0638..dc1d018e866 100644 --- a/src/gallium/drivers/iris/meson.build +++ b/src/gallium/drivers/iris/meson.build @@ -87,9 +87,9 @@ 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_libintel_common, idep_intel_driver_ds, idep_intel_dev], link_with : [ - iris_per_hw_ver_libs, libintel_compiler, libintel_dev, libisl, + iris_per_hw_ver_libs, libintel_compiler, libisl, libblorp, libintel_perf ], ) diff --git a/src/gallium/winsys/crocus/drm/meson.build b/src/gallium/winsys/crocus/drm/meson.build index 66b8dabb153..440af0e23a8 100644 --- a/src/gallium/winsys/crocus/drm/meson.build +++ b/src/gallium/winsys/crocus/drm/meson.build @@ -26,5 +26,5 @@ libcrocuswinsys = static_library( inc_gallium, inc_gallium_aux, inc_gallium_drivers, ], gnu_symbol_visibility : 'hidden', - dependencies : [dep_valgrind], + dependencies : [dep_valgrind, idep_intel_dev], ) diff --git a/src/intel/blorp/meson.build b/src/intel/blorp/meson.build index 83fb7d7e1c5..1e0d5ed72e4 100644 --- a/src/intel/blorp/meson.build +++ b/src/intel/blorp/meson.build @@ -30,7 +30,7 @@ files_libblorp = files( libblorp = static_library( 'blorp', - files_libblorp, + [files_libblorp], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build index c993c9892d7..00c4a3d6aab 100644 --- a/src/intel/common/meson.build +++ b/src/intel/common/meson.build @@ -68,7 +68,7 @@ libintel_common = static_library( c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', link_with : [libisl], - dependencies : [batch_decoder_dependencies, dep_libdrm, dep_thread, idep_genxml, idep_mesautil], + dependencies : [batch_decoder_dependencies, dep_libdrm, dep_thread, idep_genxml, idep_mesautil, idep_intel_dev], ) libintel_extra_dependencies = [] @@ -107,7 +107,7 @@ if with_tests and not with_platform_android 'genxml_test', ['tests/genxml_test.c', gentest_pack], include_directories : [inc_include, inc_src, inc_intel], - dependencies : idep_mesautil, + dependencies : [idep_mesautil, idep_intel_dev], link_with : libintel_common, c_args : [ '-DGENXML_PATH="@0@"'.format(genxml_path) @@ -129,8 +129,8 @@ if with_tests and not with_platform_android ], gnu_symbol_visibility : 'hidden', include_directories : [inc_include, inc_src, inc_intel], - link_with : [libintel_dev, libintel_common], - dependencies : [dep_libdrm, idep_gtest, idep_genxml, idep_mesautil], + link_with : [libintel_common], + dependencies : [dep_libdrm, idep_gtest, idep_genxml, idep_mesautil, idep_intel_dev], install : install_intel_gpu_tests, ) endforeach diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build index 817583b461c..dd42c5958fa 100644 --- a/src/intel/compiler/meson.build +++ b/src/intel/compiler/meson.build @@ -163,7 +163,7 @@ libintel_compiler = static_library( c_args : [no_override_init_args], override_options: ['cpp_std=c++17'], gnu_symbol_visibility : 'hidden', - dependencies : [idep_nir_headers, idep_mesautil], + dependencies : [idep_nir_headers, idep_mesautil, idep_intel_dev], build_by_default : false, ) @@ -173,12 +173,12 @@ if with_intel_clc 'intel_clc', ['intel_clc.c'], link_with : [ - libintel_compiler, libintel_common, libintel_dev, libisl, + libintel_compiler, libintel_common,libisl, ], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel], c_args : [pre_args, no_override_init_args], link_args : [ld_args_build_id], - dependencies : [idep_nir, idep_clc, idep_mesautil], + dependencies : [idep_nir, idep_clc, idep_mesautil, idep_intel_dev], native : true, ) endif @@ -205,10 +205,10 @@ if with_tests ir_expression_operation_h, include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel], link_with : [ - libintel_compiler, libintel_common, libintel_dev, libisl, + libintel_compiler, libintel_common, libisl ], override_options: ['cpp_std=c++17'], - dependencies : [idep_gtest, idep_nir, idep_mesautil], + dependencies : [idep_gtest, idep_nir, idep_mesautil, idep_intel_dev], ), suite : ['intel'], protocol : gtest_test_protocol, diff --git a/src/intel/dev/meson.build b/src/intel/dev/meson.build index 724c747b103..c159e7054a0 100644 --- a/src/intel/dev/meson.build +++ b/src/intel/dev/meson.build @@ -42,13 +42,17 @@ libintel_dev = static_library( gnu_symbol_visibility : 'hidden', ) +idep_intel_dev = declare_dependency( + link_with : libintel_dev, +) + if with_tests test('intel_device_info_test', executable( 'intel_device_info_test', 'intel_device_info_test.c', - include_directories : [inc_include, inc_src], - link_with : libintel_dev, + include_directories : [inc_include, inc_src, inc_intel], + dependencies : idep_intel_dev, ), suite : ['intel'], ) @@ -66,9 +70,8 @@ if with_tests and with_tools.contains('drm-shim') and with_tools.contains('intel intel_devinfo_override_test = executable( 'intel_device_info_override_test', 'intel_device_info_override_test.c', - dependencies : [dep_libdrm], - include_directories : [inc_include, inc_src], - link_with : libintel_dev, + dependencies : [dep_libdrm, idep_intel_dev], + include_directories : [inc_include, inc_src, inc_intel], ) intel_drm_ld_preload = join_paths(meson.current_build_dir(), '..', 'tools', 'libintel_noop_drm_shim.so') foreach _gens : platforms @@ -92,9 +95,8 @@ if with_intel_tools intel_dev_info = executable( 'intel_dev_info', files('intel_dev_info.c'), - dependencies : [dep_libdrm, dep_dl, dep_thread, dep_m], + dependencies : [dep_libdrm, dep_dl, dep_thread, dep_m, idep_intel_dev], include_directories : [inc_include, inc_src, inc_intel], - link_with : libintel_dev, c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', install : true diff --git a/src/intel/ds/meson.build b/src/intel/ds/meson.build index 6a6719cb83d..712eee46f36 100644 --- a/src/intel/ds/meson.build +++ b/src/intel/ds/meson.build @@ -37,8 +37,8 @@ libintel_driver_ds = static_library( 'intel-driver-ds', sources : ['intel_driver_ds.cc', intel_tracepoint_files], include_directories : [inc_src, inc_include, inc_intel, inc_mapi, inc_mesa], - link_with : [libintel_perf, libintel_dev, libintel_common], - dependencies : libintel_driver_ds_deps, + link_with : [libintel_perf, libintel_common], + dependencies : [libintel_driver_ds_deps, idep_intel_dev], override_options : ['cpp_std=c++17'], gnu_symbol_visibility : 'hidden', ) @@ -59,8 +59,8 @@ if with_perfetto and (with_datasources.contains('intel') or with_datasources.con 'pps-intel', sources: pps_intel_sources, include_directories: [inc_tool, inc_src, inc_include, inc_intel], - link_with: [libintel_perf, libintel_dev, libintel_common], - dependencies: [dep_perfetto, dep_libdrm, idep_mesautil], + link_with: [libintel_perf, libintel_common], + dependencies: [dep_perfetto, dep_libdrm, idep_mesautil, idep_intel_dev], override_options: ['cpp_std=c++17'] ) diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build index 7c8356255c5..c9436b82142 100644 --- a/src/intel/isl/meson.build +++ b/src/intel/isl/meson.build @@ -70,7 +70,7 @@ foreach g : [['40', isl_gfx4_files], ['50', []], ['60', isl_gfx6_files], 'isl_per_hw_ver@0@'.format(_gfx_ver), [g[1], isl_per_hw_ver_files, gen_xml_pack], include_directories : [inc_include, inc_src, inc_gallium, inc_intel], - dependencies : idep_mesautil, + dependencies : [idep_mesautil, idep_intel_dev], c_args : [ no_override_init_args, '-DGFX_VERx10=@0@'.format(_gfx_ver) @@ -100,7 +100,8 @@ isl_tiled_memcpy = static_library( include_directories : [ inc_include, inc_src, inc_mesa, inc_gallium, inc_intel, ], - dependencies : idep_mesautil, + + dependencies : [idep_mesautil, idep_intel_dev], c_args : [no_override_init_args, sse2_arg], gnu_symbol_visibility : 'hidden', extra_files : ['isl_tiled_memcpy.c'] @@ -113,7 +114,7 @@ if with_sse41 include_directories : [ inc_include, inc_src, inc_mesa, inc_gallium, inc_intel, ], - dependencies : idep_mesautil, + dependencies : [idep_mesautil, idep_intel_dev], link_args : ['-Wl,--exclude-libs=ALL'], c_args : [no_override_init_args, sse2_arg, sse41_args], gnu_symbol_visibility : 'hidden', @@ -139,7 +140,7 @@ libisl = static_library( [libisl_files, isl_format_layout_c, genX_bits_h], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel], link_with : [isl_per_hw_ver_libs, isl_tiled_memcpy, isl_tiled_memcpy_sse41], - dependencies : idep_mesautil, + dependencies : [idep_mesautil, idep_intel_dev], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', ) @@ -150,9 +151,9 @@ if with_tests executable( 'isl_surf_get_image_offset_test', 'tests/isl_surf_get_image_offset_test.c', - dependencies : [dep_m, idep_mesautil], + dependencies : [dep_m, idep_mesautil, idep_intel_dev], + link_with: libisl, include_directories : [inc_include, inc_src, inc_gallium, inc_intel], - link_with : [libisl, libintel_dev], ), suite : ['intel'], ) @@ -164,7 +165,7 @@ if with_tests 'tests/isl_aux_info_test.cpp', 'isl_aux_info.c', ], - dependencies : [dep_m, idep_gtest, idep_mesautil], + dependencies : [dep_m, idep_gtest, idep_mesautil, idep_intel_dev], include_directories : [inc_include, inc_src, inc_gallium, inc_intel], c_args : '-DIN_UNIT_TEST', cpp_args : '-DIN_UNIT_TEST', diff --git a/src/intel/perf/meson.build b/src/intel/perf/meson.build index e2d74033cd3..3704e2fb4d2 100644 --- a/src/intel/perf/meson.build +++ b/src/intel/perf/meson.build @@ -42,15 +42,16 @@ libintel_perf = static_library( c_args : [no_override_init_args, sse2_arg], cpp_args : [sse2_arg], gnu_symbol_visibility : 'hidden', + dependencies : [idep_intel_dev], ) if with_intel_tools intel_perf_query_layout = executable( 'intel_perf_query_layout', files('intel_perf_query_layout.c'), - dependencies : [idep_mesautil, dep_dl, dep_thread, dep_m], + dependencies : [idep_mesautil, dep_dl, dep_thread, dep_m, idep_intel_dev], include_directories : [inc_include, inc_src, inc_intel], - link_with : [libintel_dev, libintel_common, libintel_perf], + link_with : [libintel_common, libintel_perf], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', install : false diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build index c6eecca4c18..8839c7a6117 100644 --- a/src/intel/tools/meson.build +++ b/src/intel/tools/meson.build @@ -22,8 +22,8 @@ libaub = static_library( 'aub', files('aub_read.c', 'aub_mem.c'), include_directories : [inc_include, inc_src, inc_intel], - dependencies : idep_mesautil, - link_with : [libintel_common, libintel_dev], + dependencies : [idep_mesautil, idep_intel_dev], + link_with : [libintel_common], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', install : false @@ -32,9 +32,9 @@ libaub = static_library( aubinator = executable( 'aubinator', files('aubinator.c'), - dependencies : [idep_mesautil, dep_expat, dep_zlib, dep_dl, dep_thread, dep_m], + dependencies : [idep_mesautil, dep_expat, dep_zlib, dep_dl, dep_thread, dep_m, idep_intel_dev], include_directories : [inc_include, inc_src, inc_intel], - link_with : [libintel_common, libintel_compiler, libintel_dev, libaub], + link_with : [libintel_common, libintel_compiler, libaub], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', install : true @@ -43,9 +43,9 @@ aubinator = executable( aubinator_error_decode = executable( 'aubinator_error_decode', files('aubinator_error_decode.c'), - dependencies : [idep_mesautil, dep_zlib, dep_thread], + dependencies : [idep_mesautil, dep_zlib, dep_thread, idep_intel_dev], include_directories : [inc_include, inc_src, inc_intel], - link_with : [libintel_common, libintel_compiler, libintel_dev], + link_with : [libintel_common, libintel_compiler], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', install : true @@ -54,9 +54,9 @@ aubinator_error_decode = executable( i965_disasm = executable( 'i965_disasm', files('i965_disasm.c'), - dependencies : [idep_mesautil, dep_thread], + dependencies : [idep_mesautil, dep_thread, idep_intel_dev], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_intel], - link_with : [libintel_common, libintel_compiler, libintel_dev], + link_with : [libintel_common, libintel_compiler], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', install : true @@ -65,9 +65,8 @@ i965_disasm = executable( error2aub = executable( 'intel_error2aub', files('aub_write.h', 'aub_write.c', 'error2aub.c'), - dependencies : [dep_zlib, dep_dl, dep_thread, dep_m], + dependencies : [dep_zlib, dep_dl, dep_thread, dep_m, idep_intel_dev], include_directories : [inc_include, inc_src, inc_intel], - link_with : [libintel_dev], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', install : true @@ -116,9 +115,9 @@ libintel_dump_gpu = shared_library( 'intel_context.h', 'gfx8_context.h', 'gfx10_context.h', 'intel_aub.h', 'aub_write.h', 'aub_write.c', 'intel_dump_gpu.c', ), - dependencies : [dep_dl, idep_mesautil], + dependencies : [dep_dl, idep_mesautil, idep_intel_dev], include_directories : [inc_include, inc_src, inc_intel], - link_with : [libintel_dev, libintel_common], + link_with : [libintel_common], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', install_dir : get_option('libexecdir'), @@ -138,8 +137,7 @@ if with_tools.contains('drm-shim') 'intel_noop_drm_shim', 'intel_noop_drm_shim.c', include_directories: [inc_include, inc_src, inc_intel], - link_with: libintel_dev, - dependencies: [dep_libdrm, dep_drm_shim, idep_mesautil, idep_libintel_common], + dependencies: [dep_libdrm, dep_drm_shim, idep_mesautil, idep_libintel_common, idep_intel_dev], gnu_symbol_visibility : 'hidden', install : true, ) @@ -151,9 +149,9 @@ if with_tools.contains('intel-ui') aubinator_viewer = executable( 'aubinator_viewer', files('aubinator_viewer.cpp', 'aubinator_viewer_decoder.cpp'), - dependencies : [idep_mesautil, 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, idep_intel_dev], include_directories : [inc_include, inc_src, inc_intel], - link_with : [libintel_common, libintel_compiler, libintel_dev, libaub], + link_with : [libintel_common, libintel_compiler, libaub], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', cpp_args : ['-fpermissive', '-Wno-parentheses'], @@ -191,9 +189,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 : [idep_mesautil, dep_thread], + dependencies : [idep_mesautil, dep_thread, idep_intel_dev], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_intel], - link_with : [libintel_common, libintel_compiler, libintel_dev], + link_with : [libintel_common, libintel_compiler], c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', install : true diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index b6ea2f9d7cc..b65af9cc8e8 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -226,13 +226,13 @@ libvulkan_intel = shared_library( ], link_whole : [libanv_common, libanv_per_hw_ver_libs] + optional_libgrl, link_with : [ - libintel_compiler, libintel_dev, libisl, libblorp, libintel_perf, + libintel_compiler, libisl, libblorp, 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_driver_ds, idep_intel_dev, ], c_args : anv_flags, gnu_symbol_visibility : 'hidden', @@ -262,13 +262,13 @@ if with_tests ], link_whole : libanv_common, link_with : [ - libanv_per_hw_ver_libs, libintel_compiler, libintel_common, libintel_dev, + libanv_per_hw_ver_libs, libintel_compiler, libintel_common, libisl, libblorp, 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_mesautil, idep_intel_dev, ], c_args : anv_flags, gnu_symbol_visibility : 'hidden', @@ -287,7 +287,7 @@ if with_tests dependencies : [ dep_libdrm, dep_thread, dep_m, dep_valgrind, idep_vulkan_util, idep_vulkan_wsi_headers, - idep_vulkan_runtime, idep_intel_driver_ds, + idep_vulkan_runtime, idep_intel_driver_ds, idep_intel_dev, ], include_directories : [ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler, diff --git a/src/intel/vulkan_hasvk/meson.build b/src/intel/vulkan_hasvk/meson.build index a3fb228428c..1c44e4723c7 100644 --- a/src/intel/vulkan_hasvk/meson.build +++ b/src/intel/vulkan_hasvk/meson.build @@ -187,13 +187,13 @@ libvulkan_intel_hasvk = shared_library( ], link_whole : [libanv_hasvk_common, libanv_per_hw_ver_libs], link_with : [ - libintel_compiler, libintel_dev, libisl, libblorp, libintel_perf, + libintel_compiler, libisl, libblorp, 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_driver_ds, idep_intel_dev, ], c_args : anv_flags, gnu_symbol_visibility : 'hidden', @@ -223,13 +223,13 @@ if with_tests ], link_whole : libanv_hasvk_common, link_with : [ - libanv_per_hw_ver_libs, libintel_compiler, libintel_common, libintel_dev, + libanv_per_hw_ver_libs, libintel_compiler, libintel_common, libisl, libblorp, 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_mesautil, idep_intel_dev, ], c_args : anv_flags, gnu_symbol_visibility : 'hidden', |