diff --git a/src/intel/nullhw-layer/meson.build b/src/intel/nullhw-layer/meson.build index 618b7788776..11c3c9a6d81 100644 --- a/src/intel/nullhw-layer/meson.build +++ b/src/intel/nullhw-layer/meson.build @@ -25,7 +25,7 @@ vklayer_intel_nullhw_files = files( vklayer_intel_nullhw = shared_library( 'VkLayer_INTEL_nullhw', vklayer_intel_nullhw_files, - c_args : [no_override_init_args, vulkan_wsi_args], + c_args : [no_override_init_args], dependencies : [idep_vulkan_util, idep_mesautil, vulkan_wsi_deps, dep_dl], include_directories : [inc_include, inc_src], link_args : cc.get_supported_link_arguments(['-Wl,-Bsymbolic-functions', '-Wl,-z,relro']), diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build index 8c2f0dd0863..f4e3620664c 100644 --- a/src/vulkan/meson.build +++ b/src/vulkan/meson.build @@ -23,7 +23,6 @@ vulkan_icd_symbols = files('vulkan-icd-symbols.txt') inc_vulkan_util = include_directories('util') -vulkan_wsi_args = [] vulkan_wsi_deps = [] vulkan_wsi_list = [] diff --git a/src/vulkan/overlay-layer/meson.build b/src/vulkan/overlay-layer/meson.build index 3225b3f512b..84cc8862e69 100644 --- a/src/vulkan/overlay-layer/meson.build +++ b/src/vulkan/overlay-layer/meson.build @@ -37,8 +37,7 @@ vklayer_files = files( vklayer_mesa_overlay = shared_library( 'VkLayer_MESA_overlay', vklayer_files, overlay_spv, sha1_h, - c_args : [no_override_init_args, vulkan_wsi_args], - cpp_args : [vulkan_wsi_args], + c_args : [no_override_init_args], gnu_symbol_visibility : 'hidden', dependencies : [idep_vulkan_util, idep_mesautil, vulkan_wsi_deps, libimgui_core_dep, dep_dl], include_directories : [inc_include, inc_src], diff --git a/src/vulkan/runtime/meson.build b/src/vulkan/runtime/meson.build index 820e4537315..8e84f7e5d50 100644 --- a/src/vulkan/runtime/meson.build +++ b/src/vulkan/runtime/meson.build @@ -158,7 +158,7 @@ libvulkan_runtime = static_library( dependencies : vulkan_runtime_deps, # For glsl_type_singleton link_with : libcompiler, - c_args : [vulkan_wsi_args, c_msvc_compat_args], + c_args : [c_msvc_compat_args], gnu_symbol_visibility : 'hidden', build_by_default : false, ) diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build index ecd4ea448f0..8f232fa02e9 100644 --- a/src/vulkan/util/meson.build +++ b/src/vulkan/util/meson.build @@ -98,7 +98,7 @@ libvulkan_util = static_library( [files_vulkan_util, vk_dispatch_table, vk_enum_to_str, vk_extensions], include_directories : [inc_include, inc_src, inc_gallium], dependencies : [vulkan_wsi_deps, idep_mesautil, idep_nir_headers], - c_args : [vulkan_wsi_args, c_msvc_compat_args], + c_args : [c_msvc_compat_args], gnu_symbol_visibility : 'hidden', build_by_default : false, ) diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build index e234e31d340..fd48474b98f 100644 --- a/src/vulkan/wsi/meson.build +++ b/src/vulkan/wsi/meson.build @@ -63,7 +63,6 @@ libvulkan_wsi = static_library( vulkan_wsi_deps, dep_libdrm, dep_libudev, idep_vulkan_util_headers, idep_vulkan_runtime_headers, idep_xmlconfig, ], - c_args : [vulkan_wsi_args], gnu_symbol_visibility : 'hidden', build_by_default : false, )