From 1de2fd0cf205eda4f26c97a323d1cc509f3668f9 Mon Sep 17 00:00:00 2001 From: Michel Dänzer Date: Mon, 21 Dec 2020 12:11:40 +0100 Subject: wsi/x11: Always link against xcb-xrandr The next commit will make use of it even without VK_USE_PLATFORM_XLIB_XRANDR_EXT. Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/meson.build | 2 +- src/freedreno/vulkan/meson.build | 2 +- src/intel/vulkan/meson.build | 2 +- src/vulkan/meson.build | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 6c0fad72e1c..74c0148e88e 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -141,7 +141,7 @@ if system_has_kms_drm and not with_platform_android endif if with_xlib_lease - radv_deps += [dep_xcb_xrandr, dep_xlib_xrandr] + radv_deps += [dep_xlib_xrandr] radv_flags += '-DVK_USE_PLATFORM_XLIB_XRANDR_EXT' endif diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build index ef5912a39ed..75485e6e498 100644 --- a/src/freedreno/vulkan/meson.build +++ b/src/freedreno/vulkan/meson.build @@ -103,7 +103,7 @@ if with_platform_android endif if with_xlib_lease - tu_deps += [dep_xcb_xrandr, dep_xlib_xrandr] + tu_deps += [dep_xlib_xrandr] tu_flags += '-DVK_USE_PLATFORM_XLIB_XRANDR_EXT' endif diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 1cbed5e63e9..36b16885ce9 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -162,7 +162,7 @@ if system_has_kms_drm and not with_platform_android endif if with_xlib_lease - anv_deps += [dep_xcb_xrandr, dep_xlib_xrandr] + anv_deps += [dep_xlib_xrandr] anv_flags += '-DVK_USE_PLATFORM_XLIB_XRANDR_EXT' endif diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build index abb6617c9b4..22610a5493f 100644 --- a/src/vulkan/meson.build +++ b/src/vulkan/meson.build @@ -36,6 +36,7 @@ if with_platform_x11 dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, + dep_xcb_xrandr, dep_xshmfence, ] vulkan_wsi_list += ['xcb', 'x11'] @@ -52,7 +53,7 @@ if system_has_kms_drm and not with_platform_android 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_deps += [dep_xlib_xrandr] vulkan_wsi_list += ['xlib_xrandr'] endif -- cgit v1.2.3