diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2020-12-21 12:11:40 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2021-01-07 14:57:45 +0100 |
| commit | 1de2fd0cf205eda4f26c97a323d1cc509f3668f9 (patch) | |
| tree | 8d32898678bacd6ea00f8ce5d65e39e05c0802d5 | |
| parent | 1cce8e1101d3128703a747bec139b75d2266f4a5 (diff) | |
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 <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8197>
| -rw-r--r-- | src/amd/vulkan/meson.build | 2 | ||||
| -rw-r--r-- | src/freedreno/vulkan/meson.build | 2 | ||||
| -rw-r--r-- | src/intel/vulkan/meson.build | 2 | ||||
| -rw-r--r-- | 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 |