diff options
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/blorp/meson.build | 3 | ||||
| -rw-r--r-- | src/intel/compiler/meson.build | 12 | ||||
| -rw-r--r-- | src/intel/vulkan/meson.build | 12 |
3 files changed, 15 insertions, 12 deletions
diff --git a/src/intel/blorp/meson.build b/src/intel/blorp/meson.build index febdea97f3c..c1201b0aa16 100644 --- a/src/intel/blorp/meson.build +++ b/src/intel/blorp/meson.build @@ -30,7 +30,8 @@ files_libblorp = files( libblorp = static_library( 'blorp', - [files_libblorp, nir_opcodes_h], + files_libblorp, include_directories : [inc_common, inc_intel], c_args : [c_vis_args, no_override_init_args], + dependencies : idep_nir_headers, ) diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build index 19e5926a0d9..602206c725f 100644 --- a/src/intel/compiler/meson.build +++ b/src/intel/compiler/meson.build @@ -131,11 +131,11 @@ brw_nir_trig = custom_target( libintel_compiler = static_library( 'intel_compiler', - [libintel_compiler_files, brw_nir_trig, nir_opcodes_h, nir_builder_opcodes_h, - ir_expression_operation_h], - include_directories : [inc_common, inc_intel, inc_nir], + [libintel_compiler_files, brw_nir_trig, ir_expression_operation_h], + include_directories : [inc_common, inc_intel], c_args : [c_vis_args, no_override_init_args], cpp_args : [cpp_vis_args], + dependencies : idep_nir_headers, build_by_default : false, ) @@ -148,13 +148,13 @@ if with_tests test( t, executable( - [t, nir_opcodes_h, ir_expression_operation_h], + [t, ir_expression_operation_h], 'test_@[email protected]'.format(t), include_directories : [inc_common, inc_intel], link_with : [ - libintel_compiler, libintel_common, libnir, libmesa_util, libisl, + libintel_compiler, libintel_common, libmesa_util, libisl, ], - dependencies : [dep_thread, dep_dl, idep_gtest], + dependencies : [dep_thread, dep_dl, idep_gtest, idep_nir], ) ) endforeach diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 4cd7a025813..a0ec35dadc4 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -100,7 +100,7 @@ foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']], c_vis_args, no_override_init_args, '-msse2', '-DGEN_VERSIONx10=@0@'.format(_gen), ], - dependencies : [dep_libdrm, dep_valgrind], + dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers], ) endforeach @@ -153,13 +153,13 @@ endif libanv_common = static_library( 'anv_common', - [libanv_files, anv_entrypoints, anv_extensions_c, nir_opcodes_h], + [libanv_files, anv_entrypoints, anv_extensions_c], include_directories : [ inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util, inc_vulkan_wsi, ], c_args : [c_vis_args, no_override_init_args, '-msse2', anv_flags], - dependencies : [dep_valgrind, anv_deps, dep_libdrm], + dependencies : [dep_valgrind, anv_deps, dep_libdrm, idep_nir_headers], ) libvulkan_intel = shared_library( @@ -172,9 +172,11 @@ libvulkan_intel = shared_library( link_whole : [libanv_common, libanv_gen_libs], link_with : [ libintel_compiler, libintel_common, libisl, libblorp, libvulkan_util, - libvulkan_wsi, libnir, libmesa_util, + libvulkan_wsi, libmesa_util, + ], + dependencies : [ + dep_libdrm, dep_thread, dep_dl, dep_m, anv_deps, dep_valgrind, idep_nir, ], - dependencies : [dep_libdrm, dep_thread, dep_dl, dep_m, anv_deps, dep_valgrind], c_args : [c_vis_args, no_override_init_args, '-msse2', anv_flags], link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic, ld_args_gc_sections], install : true, |