On Fri, Sep 25, 2015 at 12:17:18PM -0700, Bryce Harrington wrote: > On Fri, Sep 25, 2015 at 11:58:40AM +0200, Emmanuel Gil Peyrot wrote: > > This mirrors what 5ffb440c3fe19669de73e51b90ea337fa2d5ae78 did for > > compositor-x11, and allows testing without having to restart the > > compositor-drm everytime. > > --- > > src/compositor-wayland.c | 7 +++++++ > > 1 file changed, 7 insertions(+) > > LGTM, > Reviewed-by: Bryce Harrington <br...@osg.samsung.com> > > (Btw, note for future patches... be sure to carry the tag when you get > a r-b; that helps patchwork track it, and it helps maintainers keep > track of how much review a given patch has had.) > > From earlier patch review: > > Reviewed-by: Pekka Paalanen <pekka.paala...@collabora.co.uk>
Thanks; pushed to trunk: To ssh://git.freedesktop.org/git/wayland/weston a0dd5b4..c59f18e master -> master > > diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c > > index f6c84d4..900c331 100644 > > --- a/src/compositor-wayland.c > > +++ b/src/compositor-wayland.c > > @@ -48,6 +48,7 @@ > > #include "shared/cairo-util.h" > > #include "fullscreen-shell-client-protocol.h" > > #include "presentation_timing-server-protocol.h" > > +#include "linux-dmabuf.h" > > > > #define WINDOW_TITLE "Weston Compositor" > > > > @@ -2022,6 +2023,12 @@ wayland_backend_create(struct weston_compositor > > *compositor, int use_pixman, > > > > wl_event_source_check(b->parent.wl_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_display: > > -- > > 2.4.2 > > > > _______________________________________________ > > wayland-devel mailing list > > wayland-devel@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/wayland-devel > _______________________________________________ > wayland-devel mailing list > wayland-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/wayland-devel _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel