diff options
| author | Dylan Baker <[email protected]> | 2017-12-12 12:22:56 -0800 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-01-11 15:40:02 -0800 |
| commit | 2083a14179eb04d22feebc5751a1a145828d07cf (patch) | |
| tree | 0fa3d2d540621d00faa6daf0c132aa5127f2dab0 /src/amd | |
| parent | 60856a7b4982aaaa4f22a002878d5d78cd63e272 (diff) | |
meson: Use dependencies for nir
This creates two new internal dependencies, idep_nir_headers and
idep_nir. The former encapsulates the generation of nir_opcodes.h and
nir_builder_opcodes.h and adding src/compiler/nir as an include path.
This ensures that any target that needs nir headers will have the
includes and that the generated headers will be generated before the
target is build. The second, idep_nir, includes the first and
additionally links to libnir.
This is intended to make it easier to avoid race conditions in the build
when using nir, since the number of consumers for libnir and it's
headers are quite high.
Acked-by: Eric Engestrom <[email protected]>
Signed-off-by: Dylan Baker <[email protected]>
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/common/meson.build | 5 | ||||
| -rw-r--r-- | src/amd/vulkan/meson.build | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/amd/common/meson.build b/src/amd/common/meson.build index 43a633a493a..22c13b955fa 100644 --- a/src/amd/common/meson.build +++ b/src/amd/common/meson.build @@ -52,12 +52,13 @@ amd_common_files = files( libamd_common = static_library( 'amd_common', - [amd_common_files, sid_tables_h, nir_opcodes_h], + [amd_common_files, sid_tables_h], include_directories : [ - inc_common, inc_compiler, inc_nir, inc_mesa, inc_mapi, inc_amd, + inc_common, inc_compiler, inc_mesa, inc_mapi, inc_amd, ], dependencies : [ dep_llvm, dep_thread, dep_elf, dep_libdrm_amdgpu, dep_valgrind, + idep_nir_headers, ], c_args : [c_vis_args], cpp_args : [cpp_vis_args], diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 054ee5e282b..74f6399ed7f 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -114,19 +114,19 @@ endif libvulkan_radeon = shared_library( 'vulkan_radeon', - [libradv_files, radv_entrypoints, radv_extensions_c, nir_opcodes_h, - vk_format_table_c], + [libradv_files, radv_entrypoints, radv_extensions_c, vk_format_table_c], include_directories : [ inc_common, inc_amd, inc_amd_common, inc_compiler, inc_vulkan_util, inc_vulkan_wsi, ], link_with : [ - libamd_common, libamdgpu_addrlib, libvulkan_util, libvulkan_wsi, libnir, + libamd_common, libamdgpu_addrlib, libvulkan_util, libvulkan_wsi, libmesa_util, ], dependencies : [ dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl, dep_m, dep_valgrind, + idep_nir, ], c_args : [c_vis_args, no_override_init_args, radv_flags], link_args : [ld_args_bsymbolic, ld_args_gc_sections], |