From 5abe488d185461261275cb2f957871a04e03dab8 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Sun, 17 Mar 2019 16:57:48 +0000 Subject: vulkan: factor out wsi dependencies In commit 530927d3f6a303d9 ("vulkan/util: generate instance/device dispatch tables") we started generating instance dispatch tables some of them (like wayland) require external headers. This commit moves the dependencies up one level so that they apply the whole vulkan directory. We use them for both the util & overlay layer. Signed-off-by: Lionel Landwerlin Fixes: 530927d3f6a303 ("vulkan/util: generate instance/device dispatch tables") Reviewed-by: Eric Engestrom --- src/vulkan/meson.build | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/vulkan/meson.build') diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build index a287c308ed2..3d4f80e2e39 100644 --- a/src/vulkan/meson.build +++ b/src/vulkan/meson.build @@ -24,22 +24,35 @@ inc_vulkan_util = include_directories('util') inc_vulkan_wsi = include_directories('wsi') vulkan_wsi_args = [] +vulkan_wsi_deps = [] vulkan_wsi_list = [] if with_platform_x11 vulkan_wsi_args += ['-DVK_USE_PLATFORM_XCB_KHR', '-DVK_USE_PLATFORM_XLIB_KHR'] + vulkan_wsi_deps += [ + dep_xcb, + dep_x11_xcb, + dep_xcb_dri2, + dep_xcb_dri3, + dep_xcb_present, + dep_xcb_sync, + dep_xshmfence, + ] vulkan_wsi_list += ['xcb', 'x11'] endif if with_platform_wayland vulkan_wsi_args += ['-DVK_USE_PLATFORM_WAYLAND_KHR'] + vulkan_wsi_deps += dep_wayland_client vulkan_wsi_list += ['wayland'] endif if with_platform_drm vulkan_wsi_args += '-DVK_USE_PLATFORM_DISPLAY_KHR' + vulkan_wsi_deps += [dep_libdrm] vulkan_wsi_list += ['drm'] endif if with_xlib_lease vulkan_wsi_args += '-DVK_USE_PLATFORM_XLIB_XRANDR_EXT' + vulkan_wsi_deps += [dep_xcb_xrandr, dep_xlib_xrandr] vulkan_wsi_list += ['xlib_xrandr'] endif -- cgit v1.2.3