From 5ba5bcf2b60c233a53014a6b5a32b82d8631b7e1 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Wed, 9 Aug 2023 14:17:27 -0500 Subject: [PATCH] vulkan/wsi: Allow binding presentation_timing when software rendering The presentation timing extension is used for doing WaitForPresent properly, but we accidentally bind it after an early return intended to stop us from binding dmabuf when software rendering. Remove the early return. cc: mesa-stable Signed-off-by: Derek Foreman Part-of: --- src/vulkan/wsi/wsi_common_wayland.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c index 9ccf26b..8d28034 100644 --- a/src/vulkan/wsi/wsi_common_wayland.c +++ b/src/vulkan/wsi/wsi_common_wayland.c @@ -782,15 +782,14 @@ registry_handle_global(void *data, struct wl_registry *registry, display->wl_shm = wl_registry_bind(registry, name, &wl_shm_interface, 1); wl_shm_add_listener(display->wl_shm, &shm_listener, display); } - return; - } - - if (strcmp(interface, zwp_linux_dmabuf_v1_interface.name) == 0 && version >= 3) { - display->wl_dmabuf = - wl_registry_bind(registry, name, &zwp_linux_dmabuf_v1_interface, - MIN2(version, ZWP_LINUX_DMABUF_V1_GET_DEFAULT_FEEDBACK_SINCE_VERSION)); - zwp_linux_dmabuf_v1_add_listener(display->wl_dmabuf, - &dmabuf_listener, display); + } else { + if (strcmp(interface, zwp_linux_dmabuf_v1_interface.name) == 0 && version >= 3) { + display->wl_dmabuf = + wl_registry_bind(registry, name, &zwp_linux_dmabuf_v1_interface, + MIN2(version, ZWP_LINUX_DMABUF_V1_GET_DEFAULT_FEEDBACK_SINCE_VERSION)); + zwp_linux_dmabuf_v1_add_listener(display->wl_dmabuf, + &dmabuf_listener, display); + } } if (strcmp(interface, wp_presentation_interface.name) == 0) { -- 2.7.4