compositor-x11: init linux_dmabuf support
authorPekka Paalanen <pekka.paalanen@collabora.co.uk>
Thu, 12 Jun 2014 13:52:53 +0000 (16:52 +0300)
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>
Fri, 14 Aug 2015 12:53:26 +0000 (15:53 +0300)
v2 changes:
- only initialize linux_dmabuf if renderer supports it

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Daniel Stone <daniels@collabora.com>
src/compositor-x11.c

index 73ba783..1c53e3b 100644 (file)
@@ -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: