meson: replace vk_wsi_args with dependencies to let meson take care of transitivity

Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19497>

src/vulkan/device-select-layer/meson.build

@@ -39,7 +39,7 @@ endif
 vklayer_mesa_device_select = shared_library(
   'VkLayer_MESA_device_select',
   vklayer_files,
-  c_args : [no_override_init_args, vklayer_flags, vk_wsi_args],
+  c_args : [no_override_init_args, vklayer_flags],
   gnu_symbol_visibility : 'hidden',
   dependencies : [
     idep_vulkan_util, idep_vulkan_wsi_headers, idep_mesautil, vklayer_deps,

src/vulkan/meson.build

@@ -71,7 +71,10 @@ if host_machine.system() == 'darwin'
   vulkan_wsi_list += '-DVK_USE_PLATFORM_METAL_EXT'
 endif
 
-vk_wsi_args = vulkan_wsi_list
+idep_vulkan_wsi_defines = declare_dependency(
+  compile_args : vulkan_wsi_list,
+)
+vulkan_wsi_deps += idep_vulkan_wsi_defines
 
 subdir('util')
 subdir('runtime')

src/vulkan/runtime/meson.build

@@ -189,7 +189,7 @@ libvulkan_runtime = static_library(
   dependencies : vulkan_runtime_deps,
   # For glsl_type_singleton
   link_with : libcompiler,
-  c_args : [c_msvc_compat_args, vk_wsi_args],
+  c_args : c_msvc_compat_args,
   gnu_symbol_visibility : 'hidden',
   build_by_default : false,
 )

src/vulkan/wsi/meson.build

@@ -60,8 +60,6 @@ wsi_entrypoints = custom_target(
 libvulkan_wsi = static_library(
   'vulkan_wsi',
   [files_vulkan_wsi, wsi_entrypoints],
-  c_args: [vk_wsi_args],
-  cpp_args: [vk_wsi_args],
   include_directories : [inc_include, inc_src, inc_gallium],
   dependencies : [
     vulkan_wsi_deps, dep_libdrm, dep_libudev, idep_vulkan_util_headers,
@@ -72,6 +70,7 @@ libvulkan_wsi = static_library(
 )
 
 idep_vulkan_wsi_headers = declare_dependency(
+  dependencies : idep_vulkan_wsi_defines,
   include_directories : include_directories('.')
 )