input : ['radv_entrypoints_gen.py', vk_api_xml],
output : ['radv_entrypoints.h', 'radv_entrypoints.c'],
command : [
- prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--outdir',
+ prog_python, '@INPUT0@', '--xml', '@INPUT1@', '--outdir',
meson.current_build_dir()
],
depend_files : files('radv_extensions.py'),
input : ['radv_extensions.py', vk_api_xml],
output : ['radv_extensions.c', 'radv_extensions.h'],
command : [
- prog_python2, '@INPUT0@', '--xml', '@INPUT1@', '--out-c', '@OUTPUT0@',
+ prog_python, '@INPUT0@', '--xml', '@INPUT1@', '--out-c', '@OUTPUT0@',
'--out-h', '@OUTPUT1@'
],
)
-vk_format_table_c = custom_target(
- 'vk_format_table.c',
+amd_vk_format_table_c = custom_target(
+ 'amd_vk_format_table.c',
input : ['vk_format_table.py', 'vk_format_layout.csv'],
output : 'vk_format_table.c',
- command : [prog_python2, '@INPUT@'],
+ command : [prog_python, '@INPUT@'],
depend_files : files('vk_format_parse.py'),
capture : true,
)
libradv_files = files(
+ 'layers/radv_sqtt_layer.c',
'winsys/amdgpu/radv_amdgpu_bo.c',
'winsys/amdgpu/radv_amdgpu_bo.h',
'winsys/amdgpu/radv_amdgpu_cs.c',
'winsys/amdgpu/radv_amdgpu_winsys.c',
'winsys/amdgpu/radv_amdgpu_winsys.h',
'winsys/amdgpu/radv_amdgpu_winsys_public.h',
+ 'winsys/null/radv_null_bo.c',
+ 'winsys/null/radv_null_bo.h',
+ 'winsys/null/radv_null_cs.c',
+ 'winsys/null/radv_null_cs.h',
+ 'winsys/null/radv_null_winsys.c',
+ 'winsys/null/radv_null_winsys_public.h',
+ 'radv_android.c',
'radv_cmd_buffer.c',
'radv_cs.h',
'radv_debug.c',
'radv_descriptor_set.h',
'radv_formats.c',
'radv_image.c',
+ 'radv_llvm_helper.cpp',
'radv_meta.c',
'radv_meta.h',
'radv_meta_blit.c',
'radv_meta_copy.c',
'radv_meta_decompress.c',
'radv_meta_fast_clear.c',
+ 'radv_meta_fmask_expand.c',
'radv_meta_resolve.c',
'radv_meta_resolve_cs.c',
'radv_meta_resolve_fs.c',
+ 'radv_nir_lower_ycbcr_textures.c',
'radv_nir_to_llvm.c',
'radv_pass.c',
'radv_pipeline.c',
'radv_pipeline_cache.c',
'radv_private.h',
'radv_radeon_winsys.h',
+ 'radv_rgp.c',
'radv_shader.c',
'radv_shader.h',
+ 'radv_shader_args.c',
+ 'radv_shader_args.h',
+ 'radv_shader_helper.h',
'radv_shader_info.c',
+ 'radv_sqtt.c',
'radv_query.c',
'radv_util.c',
'radv_util.h',
libradv_files += files('radv_wsi_wayland.c')
endif
-if with_platform_drm
+if system_has_kms_drm
radv_flags += '-DVK_USE_PLATFORM_DISPLAY_KHR'
libradv_files += files('radv_wsi_display.c')
endif
radv_flags += '-DVK_USE_PLATFORM_XLIB_XRANDR_EXT'
endif
+if with_platform_android
+ radv_deps += dep_android
+ radv_flags += [
+ '-DVK_USE_PLATFORM_ANDROID_KHR'
+ ]
+endif
+
libvulkan_radeon = shared_library(
'vulkan_radeon',
- [libradv_files, radv_entrypoints, radv_extensions_c, vk_format_table_c],
+ [libradv_files, radv_entrypoints, radv_extensions_c, amd_vk_format_table_c, sha1_h],
include_directories : [
- inc_common, inc_amd, inc_amd_common, inc_compiler, inc_vulkan_util,
- inc_vulkan_wsi,
+ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util, inc_vulkan_wsi,
],
link_with : [
- libamd_common, libamdgpu_addrlib, libvulkan_util, libvulkan_wsi,
- libmesa_util,
+ libamd_common, libamd_common_llvm, libamdgpu_addrlib, libvulkan_wsi,
],
dependencies : [
dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl, dep_m,
- dep_valgrind,
- idep_nir,
+ dep_valgrind, radv_deps, idep_aco,
+ idep_mesautil, idep_nir, idep_vulkan_util, idep_amdgfxregs_h, idep_xmlconfig,
],
- c_args : [c_vis_args, no_override_init_args, radv_flags],
+ c_args : [no_override_init_args, radv_flags],
+ cpp_args : [radv_flags],
link_args : [ld_args_bsymbolic, ld_args_gc_sections],
+ gnu_symbol_visibility : 'hidden',
install : true,
)
+if with_symbols_check
+ test(
+ 'radv symbols check',
+ symbols_check,
+ args : [
+ '--lib', libvulkan_radeon,
+ '--symbols-file', vulkan_icd_symbols,
+ '--ignore-symbol', 'ac_init_llvm_once',
+ symbols_check_args,
+ ],
+ suite : ['amd'],
+ )
+endif
+
radeon_icd = custom_target(
'radeon_icd',
input : 'radv_icd.py',
output : 'radeon_icd.@0@.json'.format(host_machine.cpu()),
command : [
- prog_python2, '@INPUT@',
+ prog_python, '@INPUT@',
'--lib-path', join_paths(get_option('prefix'), get_option('libdir')),
'--out', '@OUTPUT@',
],
install_dir : with_vulkan_icd_dir,
install : true,
)
-
-radv_dev_icd = custom_target(
- 'radv_dev_icd',
- input : 'radv_icd.py',
- output : 'dev_icd.json',
- command : [
- prog_python2, '@INPUT@', '--lib-path', meson.current_build_dir(),
- '--out', '@OUTPUT@'
- ],
- depend_files : files('radv_extensions.py'),
- build_by_default : true,
- install : false,
-)