[mutter/wip/texture-purge-on-nvidia: 45/71] wayland: Realize dmabuf buffers before trying to attach them
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/texture-purge-on-nvidia: 45/71] wayland: Realize dmabuf buffers before trying to attach them
- Date: Mon, 14 Jan 2019 21:02:51 +0000 (UTC)
commit 7d8ff610697b8f305593a32b448cc52fb07cb1e2
Author: Miguel A. Vico <mvicomoya nvidia com>
Date: Thu Jun 21 02:53:15 2018 +0000
wayland: Realize dmabuf buffers before trying to attach them
Commit 22723ca37 moved buffer realization to
meta_wayland_surface_commit() so that it wouldn't be part of
meta_wayland_buffer_attach().
However, creation of dmabuf buffers would call into
meta_wayland_buffer_attach() directly without realizing the buffer
first. attach() would then fail and mutter would effectively shut down
any clients using the zwp_linux_dmabuf protocol (note that if such
client was Xwayland, mutter itself would shut down as well).
Add the missing bit in order to make zwp_linux_dmabuf protocol work
again.
(cherry picked from commit 54709c16b56a308d2254c56a35d042bf8b8e124f)
src/wayland/meta-wayland-dma-buf.c | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/src/wayland/meta-wayland-dma-buf.c b/src/wayland/meta-wayland-dma-buf.c
index 76b8aa219..e72c53935 100644
--- a/src/wayland/meta-wayland-dma-buf.c
+++ b/src/wayland/meta-wayland-dma-buf.c
@@ -365,6 +365,7 @@ buffer_params_create_common (struct wl_client *client,
dma_buf, NULL);
buffer = meta_wayland_buffer_from_resource (buffer_resource);
+ meta_wayland_buffer_realize (buffer);
if (!meta_wayland_buffer_attach (buffer, &error))
{
if (buffer_id == 0)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]