From 85ca7fab29bae3410c9ea66d3807afe55b64069d Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Thu, 6 Jan 2022 21:57:28 +0100 Subject: [PATCH] radv: Add common entrypoint dependency. To ensure we have the header. The revert likely reintroduced compilation flakiness due to missing dependencies. Fixes: a255f6f8230 ("radv: do not use the common entrypoint for the Metro Exodus layer") Reviewed-by: Jesse Natalie Part-of: --- src/amd/vulkan/meson.build | 1 + src/vulkan/runtime/meson.build | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 92d3c4b..745bb03 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -163,6 +163,7 @@ libvulkan_radeon = shared_library( dep_valgrind, radv_deps, idep_aco, idep_mesautil, idep_nir, idep_vulkan_util, idep_vulkan_wsi, idep_vulkan_runtime, idep_amdgfxregs_h, idep_xmlconfig, + idep_vulkan_common_entrypoints_h ], c_args : [no_override_init_args, radv_flags, c_msvc_compat_args], cpp_args : [radv_flags, cpp_msvc_compat_args], diff --git a/src/vulkan/runtime/meson.build b/src/vulkan/runtime/meson.build index 2eabf06..b2725bc 100644 --- a/src/vulkan/runtime/meson.build +++ b/src/vulkan/runtime/meson.build @@ -145,6 +145,10 @@ idep_vulkan_runtime_headers = declare_dependency( include_directories : include_directories('.') ) +idep_vulkan_common_entrypoints_h = declare_dependency( + sources : [vk_common_entrypoints[0]] +) + # This is likely a bug in the Meson VS backend, as MSVC with ninja works fine. # See this discussion here: # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10506 -- 2.7.4