mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-03-14 05:34:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend/wayland: handle DMA-BUF import failures

Browse source 
create_immed() is a bit dangerous because on failure, either the
connection is closed or the buffer is silently ignored.

Use create() with a roundtrip to figure out whether the import
succeeded.
This commit is contained in:
Simon Ser 2024-10-03 22:33:02 +02:00 • committed by Simon Zeni
parent 9e71c88467
commit baeecc8dbd
1 changed files with 36 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

40
backend/wayland/output.c
View file

@ -175,6 +175,30 @@ static bool test_buffer(struct wlr_wl_backend *wl,
} }
} }
struct dmabuf_listener_data {
struct wl_buffer *wl_buffer;
bool done;
};
static void dmabuf_handle_created(void *data_, struct zwp_linux_buffer_params_v1 *params,
struct wl_buffer *buffer) {
struct dmabuf_listener_data *data = data_;
data->wl_buffer = buffer;
data->done = true;
wlr_log(WLR_DEBUG, "DMA-BUF imported into parent Wayland compositor");
}
static void dmabuf_handle_failed(void *data_, struct zwp_linux_buffer_params_v1 *params) {
struct dmabuf_listener_data *data = data_;
data->done = true;
wlr_log(WLR_ERROR, "Failed to import DMA-BUF into parent Wayland compositor");
}
static const struct zwp_linux_buffer_params_v1_listener dmabuf_listener = {
.created = dmabuf_handle_created,
.failed = dmabuf_handle_failed,
};
static struct wl_buffer *import_dmabuf(struct wlr_wl_backend *wl, static struct wl_buffer *import_dmabuf(struct wlr_wl_backend *wl,
struct wlr_dmabuf_attributes *dmabuf) { struct wlr_dmabuf_attributes *dmabuf) {
uint32_t modifier_hi = dmabuf->modifier >> 32; uint32_t modifier_hi = dmabuf->modifier >> 32;
@ -186,11 +210,19 @@ static struct wl_buffer *import_dmabuf(struct wlr_wl_backend *wl,
dmabuf->offset[i], dmabuf->stride[i], modifier_hi, modifier_lo); dmabuf->offset[i], dmabuf->stride[i], modifier_hi, modifier_lo);
} }
struct wl_buffer *wl_buffer = zwp_linux_buffer_params_v1_create_immed( struct dmabuf_listener_data data = {0};
params, dmabuf->width, dmabuf->height, dmabuf->format, 0); zwp_linux_buffer_params_v1_add_listener(params, &dmabuf_listener, &data);
zwp_linux_buffer_params_v1_create(params, dmabuf->width, dmabuf->height, dmabuf->format, 0);
while (!data.done) {
if (wl_display_dispatch(wl->remote_display) < 0) {
wlr_log(WLR_ERROR, "wl_display_dispatch() failed");
break;
}
}
zwp_linux_buffer_params_v1_destroy(params); zwp_linux_buffer_params_v1_destroy(params);
// TODO: handle create() errors return data.wl_buffer;
return wl_buffer;
} }
static struct wl_buffer *import_shm(struct wlr_wl_backend *wl, static struct wl_buffer *import_shm(struct wlr_wl_backend *wl,