[libradv_files, radv_entrypoints, sha1_h],
vs_module_defs : vulkan_radv_def,
include_directories : [
- 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,
+ 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,
],
link_with : [
- libamd_common, libamd_common_llvm, libamdgpu_addrlib, libvulkan_wsi,
+ libamd_common, libamd_common_llvm, libamdgpu_addrlib,
],
dependencies : [
dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl, dep_m,
dep_valgrind, radv_deps, idep_aco,
- idep_mesautil, idep_nir, idep_vulkan_util, idep_amdgfxregs_h, idep_xmlconfig,
+ idep_mesautil, idep_nir, idep_vulkan_util, idep_vulkan_wsi,
+ idep_amdgfxregs_h, idep_xmlconfig,
],
c_args : [no_override_init_args, radv_flags, c_msvc_compat_args],
cpp_args : [radv_flags, cpp_msvc_compat_args],
idep_nir,
idep_nir_headers,
idep_vulkan_util,
+ idep_vulkan_wsi,
]
if with_platform_x11
[files_per_version, v3d_xml_pack, v3dv_entrypoints[0]],
include_directories : [
inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom,
- inc_compiler, inc_util, inc_vulkan_wsi,
+ inc_compiler, inc_util,
],
c_args : [v3dv_flags, '-DV3D_VERSION=' + ver],
gnu_symbol_visibility : 'hidden',
'vulkan_broadcom',
[libv3dv_files, v3dv_entrypoints, sha1_h],
include_directories : [
- inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom, inc_compiler, inc_util, inc_vulkan_wsi,
+ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom, inc_compiler, inc_util,
],
link_with : [
libbroadcom_cle,
libbroadcom_v3d,
- libvulkan_wsi,
per_version_libs,
],
dependencies : v3dv_deps,
tu_deps = []
tu_flags = []
-tu_link_with = []
tu_wsi = false
if tu_wsi
libtu_files += 'tu_wsi.c'
- tu_link_with += libvulkan_wsi
endif
if with_platform_android
inc_gallium,
inc_gallium_aux,
inc_compiler,
- inc_vulkan_wsi,
inc_freedreno,
],
link_with : [
- tu_link_with,
libfreedreno_ir3,
libfreedreno_layout,
libfreedreno_perfcntrs,
idep_nir,
tu_deps,
idep_vulkan_util,
+ idep_vulkan_wsi,
idep_mesautil,
],
c_args : [no_override_init_args, tu_flags],
'zink',
[files_libzink, zink_device_info, zink_instance, zink_nir_algebraic_c, vk_dispatch_table],
gnu_symbol_visibility : 'hidden',
- include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_vulkan_wsi, inc_vulkan_util, inc_zink_vk],
- dependencies: [dep_vulkan, idep_nir_headers, idep_mesautil, idep_vulkan_util_headers, dep_libdrm],
+ include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_vulkan_util, inc_zink_vk],
+ dependencies: [
+ dep_vulkan, idep_nir_headers, idep_mesautil, idep_vulkan_util_headers,
+ idep_vulkan_wsi_headers, dep_libdrm
+ ],
c_args: zink_c_args,
)
liblavapipe_st = static_library(
'lavapipe_st',
[liblvp_files, lvp_entrypoints, lvp_commands, sha1_h],
- link_with : [ libvulkan_wsi ],
c_args : [ c_msvc_compat_args, lvp_flags ],
gnu_symbol_visibility : 'hidden',
- include_directories : [ inc_include, inc_src, inc_util, inc_gallium, inc_compiler, inc_gallium_aux, inc_vulkan_wsi ],
- dependencies : [ idep_nir, idep_mesautil, idep_vulkan_util, lvp_deps ]
+ include_directories : [ inc_include, inc_src, inc_util, inc_gallium, inc_compiler, inc_gallium_aux ],
+ dependencies : [ idep_nir, idep_mesautil, idep_vulkan_util, idep_vulkan_wsi, lvp_deps ]
)
'anv_per_hw_ver@0@'.format(_gfx_ver),
[anv_per_hw_ver_files, g[1], anv_entrypoints[0]],
include_directories : [
- inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_compiler, inc_intel, inc_vulkan_wsi,
+ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_compiler, inc_intel,
],
c_args : [
no_override_init_args, c_sse2_args,
],
gnu_symbol_visibility : 'hidden',
dependencies : [
- dep_libdrm, dep_valgrind, idep_nir_headers, idep_genxml, idep_vulkan_util_headers,
+ dep_libdrm, dep_valgrind, idep_nir_headers, idep_genxml,
+ idep_vulkan_util_headers, idep_vulkan_wsi_headers,
],
)
endforeach
idep_genxml,
idep_nir_headers,
idep_vulkan_util_headers,
+ idep_vulkan_wsi_headers,
]
anv_flags = [
no_override_init_args,
],
include_directories : [
inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler,
- inc_vulkan_wsi, inc_util,
+ inc_util,
],
c_args : anv_flags,
gnu_symbol_visibility : 'hidden',
'vulkan_intel',
[files('anv_gem.c'), anv_entrypoints[0]],
include_directories : [
- inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler, inc_vulkan_wsi,
+ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler,
],
link_whole : [libanv_common, libanv_per_hw_ver_libs],
link_with : [
- libintel_compiler, libintel_dev, libisl, libblorp, libvulkan_wsi,
- libintel_perf,
+ libintel_compiler, libintel_dev, libisl, libblorp, libintel_perf,
],
dependencies : [
dep_thread, dep_dl, dep_m, anv_deps, idep_libintel_common,
- idep_nir, idep_genxml, idep_vulkan_util, idep_mesautil, idep_xmlconfig,
+ idep_nir, idep_genxml, idep_vulkan_util, idep_vulkan_wsi,
+ idep_mesautil, idep_xmlconfig,
],
c_args : anv_flags,
gnu_symbol_visibility : 'hidden',
'vulkan_intel_test',
[files('anv_gem_stubs.c'), anv_entrypoints[0]],
include_directories : [
- inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler, inc_vulkan_wsi,
+ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler,
],
link_whole : libanv_common,
link_with : [
libanv_per_hw_ver_libs, libintel_compiler, libintel_common, libintel_dev,
- libisl, libblorp, libvulkan_wsi, libintel_perf,
+ libisl, libblorp, libintel_perf,
],
dependencies : [
dep_thread, dep_dl, dep_m, anv_deps,
- idep_nir, idep_vulkan_util, idep_mesautil,
+ idep_nir, idep_vulkan_util, idep_vulkan_wsi, idep_mesautil,
],
c_args : anv_flags,
gnu_symbol_visibility : 'hidden',
['tests/@0@.c'.format(t), anv_entrypoints[0]],
c_args : [ c_sse2_args ],
link_with : libvulkan_intel_test,
- dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind, idep_vulkan_util, ],
+ dependencies : [
+ dep_libdrm, dep_thread, dep_m, dep_valgrind,
+ idep_vulkan_util, idep_vulkan_wsi_headers,
+ ],
include_directories : [
- inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler, inc_vulkan_wsi,
+ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler,
],
),
suite : ['intel'],
inc_compiler,
inc_gallium, # XXX: pipe/p_format.h
inc_gallium_aux, # XXX: renderonly
- inc_vulkan_wsi,
inc_panfrost,
],
dependencies : [
idep_nir_headers,
idep_pan_packers,
idep_vulkan_util_headers,
+ idep_vulkan_wsi_headers,
dep_libdrm,
dep_valgrind,
],
inc_compiler,
inc_gallium, # XXX: pipe/p_format.h
inc_gallium_aux, # XXX: renderonly
- inc_vulkan_wsi,
inc_panfrost,
],
link_whole : [panvk_per_arch_libs],
link_with : [
- libvulkan_wsi,
libpanfrost_shared,
libpanfrost_midgard,
libpanfrost_bifrost,
idep_pan_packers,
panvk_deps,
idep_vulkan_util,
+ idep_vulkan_wsi,
idep_mesautil,
],
c_args : [no_override_init_args, panvk_flags],
dep_thread,
idep_mesautil,
idep_vulkan_util,
+ idep_vulkan_wsi,
idep_xmlconfig,
]
if with_platform_wayland or with_platform_x11
libvn_files += files('vn_wsi.c')
vn_flags += '-DVN_USE_WSI_PLATFORM'
- vn_libs += libvulkan_wsi
endif
if with_platform_wayland
'vulkan_virtio',
[libvn_files, vn_entrypoints, sha1_h],
include_directories : [
- inc_include, inc_src, inc_vulkan_wsi, inc_virtio,
+ inc_include, inc_src, inc_virtio,
],
link_with : vn_libs,
dependencies : [vn_deps],
vklayer_files,
c_args : [no_override_init_args, vklayer_flags],
gnu_symbol_visibility : 'hidden',
- dependencies : [idep_vulkan_util, idep_mesautil, vklayer_deps, dep_libdrm, dep_dl],
- include_directories : [inc_include, inc_util, inc_src, inc_vulkan_wsi],
+ dependencies : [
+ idep_vulkan_util, idep_vulkan_wsi_headers, idep_mesautil, vklayer_deps,
+ dep_libdrm, dep_dl
+ ],
+ include_directories : [inc_include, inc_util, inc_src],
link_args : cc.get_supported_link_arguments(['-Wl,-Bsymbolic-functions', '-Wl,-z,relro']),
install : true
)
vk_api_xml = files('registry/vk.xml')
vulkan_icd_symbols = files('vulkan-icd-symbols.txt')
-inc_vulkan_wsi = include_directories('wsi')
inc_vulkan_util = include_directories('util')
vulkan_wsi_args = []
gnu_symbol_visibility : 'hidden',
build_by_default : false,
)
+
+idep_vulkan_wsi_headers = declare_dependency(
+ include_directories : include_directories('.')
+)
+
+idep_vulkan_wsi = declare_dependency(
+ link_with : libvulkan_wsi,
+ dependencies : idep_vulkan_wsi_headers
+)