fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-30 23:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

loader/wayland: Add named queue fallback

Browse source 
If libwayland isn't new enough to create event queues with names, just
throw away the name. It's just a debug feature anyway.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27824>
This commit is contained in:
Derek Foreman 2024-02-09 11:05:36 -06:00 • committed by Marge Bot
parent 4e219a22e2
commit eb1235f343
3 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -2020,6 +2020,12 @@ if with_platform_wayland
dependencies: dep_wayland_client)
pre_args += ['-DHAVE_WL_DISPATCH_QUEUE_TIMEOUT']
endif
if cc.has_function(
'wl_display_create_queue_with_name',
prefix : '#include <wayland-client.h>',
dependencies: dep_wayland_client)
pre_args += ['-DHAVE_WL_CREATE_QUEUE_WITH_NAME']
endif
endif
dep_x11 = null_dep

8
src/loader/loader_wayland_helper.c
View file

@ -133,3 +133,11 @@ wl_display_dispatch_queue_timeout(struct wl_display *display,
return ret;
}
#endif
#ifndef HAVE_WL_CREATE_QUEUE_WITH_NAME
struct wl_event_queue *
wl_display_create_queue_with_name(struct wl_display *display, const char *name)
{
return wl_display_create_queue(display);
}
#endif

9
src/loader/loader_wayland_helper.h
View file

@ -23,9 +23,10 @@
#ifndef LOADER_WAYLAND_HELPER_HEADER_H
#define LOADER_WAYLAND_HELPER_HEADER_H
#include <wayland-client.h>
#ifndef HAVE_WL_DISPATCH_QUEUE_TIMEOUT
#include <wayland-client.h>
#include <util/timespec.h>
int
wl_display_dispatch_queue_timeout(struct wl_display *display,
@ -33,4 +34,10 @@ wl_display_dispatch_queue_timeout(struct wl_display *display,
const struct timespec *deadline);
#endif
#ifndef HAVE_WL_CREATE_QUEUE_WITH_NAME
struct wl_event_queue *
wl_display_create_queue_with_name(struct wl_display *display,
const char *name);
#endif
#endif