install : true,
)
-dev_icd = custom_target(
- 'dev_icd',
- input : 'anv_icd.py',
- output : 'dev_icd.@0@.json'.format(host_machine.cpu()),
- command : [
- prog_python, '@INPUT@', '--lib-path', meson.current_build_dir(),
- '--out', '@OUTPUT@'
- ],
- depend_files : files('anv_extensions.py'),
- build_by_default : true,
- install : false,
-)
-
libanv_gen_libs = []
anv_gen_files = files(
'genX_blorp_exec.c',
)
foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']],
['80', ['gen8_cmd_buffer.c']], ['90', ['gen8_cmd_buffer.c']],
- ['100', ['gen8_cmd_buffer.c']], ['110', ['gen8_cmd_buffer.c']]]
+ ['100', ['gen8_cmd_buffer.c']], ['110', ['gen8_cmd_buffer.c']],
+ ['120', ['gen8_cmd_buffer.c']]]
_gen = g[0]
libanv_gen_libs += static_library(
'anv_gen@0@'.format(_gen),
[anv_gen_files, g[1], anv_entrypoints[0], anv_extensions_h],
include_directories : [
- inc_common, inc_compiler, inc_include, inc_intel, inc_vulkan_wsi,
+ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_compiler, inc_intel, inc_vulkan_wsi,
],
c_args : [
- c_vis_args, no_override_init_args, c_sse2_args,
+ no_override_init_args, c_sse2_args,
'-DGEN_VERSIONx10=@0@'.format(_gen),
],
+ gnu_symbol_visibility : 'hidden',
dependencies : [
dep_libdrm, dep_valgrind, idep_nir_headers, idep_genxml, idep_vulkan_util_headers,
],
'anv_nir.h',
'anv_nir_add_base_work_group_id.c',
'anv_nir_apply_pipeline_layout.c',
+ 'anv_nir_compute_push_layout.c',
'anv_nir_lower_multiview.c',
- 'anv_nir_lower_push_constants.c',
'anv_nir_lower_ycbcr_textures.c',
'anv_pass.c',
+ 'anv_perf.c',
'anv_pipeline.c',
'anv_pipeline_cache.c',
'anv_private.h',
idep_vulkan_util_headers,
]
anv_flags = [
- c_vis_args,
no_override_init_args,
c_sse2_args,
]
libanv_files += files('anv_wsi_wayland.c')
endif
-if with_platform_drm
+if system_has_kms_drm and not with_platform_android
anv_flags += '-DVK_USE_PLATFORM_DISPLAY_KHR'
libanv_files += files('anv_wsi_display.c')
endif
gen_xml_pack,
],
include_directories : [
- inc_common, inc_intel, inc_compiler, inc_include,
- inc_vulkan_wsi,
+ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler,
+ inc_vulkan_wsi, inc_util,
],
c_args : anv_flags,
+ gnu_symbol_visibility : 'hidden',
dependencies : anv_deps,
)
'vulkan_intel',
[files('anv_gem.c'), anv_entrypoints[0], anv_extensions_h],
include_directories : [
- inc_common, inc_intel, inc_compiler, inc_include, inc_vulkan_wsi,
+ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler, inc_vulkan_wsi,
],
link_whole : [libanv_common, libanv_gen_libs],
link_with : [
- libintel_compiler, libintel_common, libintel_dev, libisl, libblorp,
- libvulkan_wsi, libmesa_util,
+ libintel_compiler, libintel_dev, libisl, libblorp, libvulkan_wsi,
+ libintel_perf,
],
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_libintel_common,
+ idep_nir, idep_genxml, idep_vulkan_util, idep_mesautil, idep_xmlconfig,
],
c_args : anv_flags,
+ gnu_symbol_visibility : 'hidden',
link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic, ld_args_gc_sections],
install : true,
)
+if with_symbols_check
+ test(
+ 'anv symbols check',
+ symbols_check,
+ args : [
+ '--lib', libvulkan_intel,
+ '--symbols-file', vulkan_icd_symbols,
+ symbols_check_args,
+ ],
+ suite : ['intel'],
+ )
+endif
+
if with_tests
libvulkan_intel_test = static_library(
'vulkan_intel_test',
[files('anv_gem_stubs.c'), anv_entrypoints[0], anv_extensions_h],
include_directories : [
- inc_common, inc_intel, inc_compiler, inc_include, inc_vulkan_wsi,
+ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler, inc_vulkan_wsi,
],
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, libintel_perf,
],
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,
+ gnu_symbol_visibility : 'hidden',
)
- foreach t : ['block_pool_no_free', 'state_pool_no_free',
- 'state_pool_free_list_only', 'state_pool',
- 'state_pool_padding']
+ foreach t : ['block_pool_no_free', 'block_pool_grow_first',
+ 'state_pool_no_free', 'state_pool_free_list_only',
+ 'state_pool', 'state_pool_padding']
test(
'anv_@0@'.format(t),
executable(
link_with : libvulkan_intel_test,
dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind, idep_vulkan_util, ],
include_directories : [
- inc_common, inc_intel, inc_compiler, inc_vulkan_wsi,
+ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler, inc_vulkan_wsi,
],
),
suite : ['intel'],