From 5ffb440c3fe19669de73e51b90ea337fa2d5ae78 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Thu, 12 Jun 2014 16:52:53 +0300 Subject: [PATCH] compositor-x11: init linux_dmabuf support v2 changes: - only initialize linux_dmabuf if renderer supports it Signed-off-by: Pekka Paalanen Reviewed-by: Daniel Stone --- src/compositor-x11.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/compositor-x11.c b/src/compositor-x11.c index 73ba783..1c53e3b 100644 --- a/src/compositor-x11.c +++ b/src/compositor-x11.c @@ -56,6 +56,7 @@ #include "shared/helpers.h" #include "shared/image-loader.h" #include "presentation_timing-server-protocol.h" +#include "linux-dmabuf.h" #define DEFAULT_AXIS_STEP_DISTANCE wl_fixed_from_int(10) @@ -1665,7 +1666,14 @@ x11_backend_create(struct weston_compositor *compositor, x11_backend_handle_event, b); wl_event_source_check(b->xcb_source); + if (compositor->renderer->import_dmabuf) { + if (linux_dmabuf_setup(compositor) < 0) + weston_log("Error: initializing dmabuf " + "support failed.\n"); + } + compositor->backend = &b->base; + return b; err_x11_input: -- 2.7.4