summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguel A. Vico <mvicomoya@nvidia.com>2018-06-21 02:53:15 +0000
committerMarco Trevisan <mail@3v1n0.net>2018-08-31 15:08:06 +0000
commit9ac07b40052b02d5b3aeb268fa64b4583dd53abd (patch)
treeb9613238d1e681a8c8651816784d36ae73e0fd77
parent527f6ef8357f614793035a999ec4409ef02470e2 (diff)
downloadmutter-9ac07b40052b02d5b3aeb268fa64b4583dd53abd.tar.gz
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)
-rw-r--r--src/wayland/meta-wayland-dma-buf.c1
1 files changed, 1 insertions, 0 deletions
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)