Merge remote-tracking branch 'bnf/fullscreen-pageflip'

[profile/ivi/weston.git] / compositor / compositor-x11.c

diff --git a/compositor/compositor-x11.c b/compositor/compositor-x11.c
index 108955f..47843d4 100644 (file)
--- a/compositor/compositor-x11.c
+++ b/compositor/compositor-x11.c
@@ -191,6 +191,21 @@ x11_output_present(struct wlsc_output *output_base)
        return 0;
 }
 
+static int
+x11_output_image_is_scanoutable(struct wlsc_output *output_base,
+                               EGLImageKHR image)
+{
+       return 0;
+}
+
+static int
+x11_output_set_cursor(struct wlsc_output *output_base,
+                     struct wl_input_device *input)
+{
+       return -1;
+}
+
+
 static void
 x11_output_set_wm_protocols(struct x11_output *output)
 {
@@ -339,6 +354,8 @@ x11_compositor_create_output(struct x11_compositor *c, int width, int height)
 
        output->base.prepare_render = x11_output_prepare_render;
        output->base.present = x11_output_present;
+       output->base.image_is_scanoutable = x11_output_image_is_scanoutable;
+       output->base.set_hardware_cursor = x11_output_set_cursor;
 
        wl_list_insert(c->base.output_list.prev, &output->base.link);
 
@@ -599,7 +616,6 @@ x11_compositor_create(struct wl_display *display, int width, int height)
                return NULL;
 
        c->base.destroy = x11_destroy;
-       c->base.create_buffer = wlsc_shm_buffer_create;
 
        /* Can't init base class until we have a current egl context */
        if (wlsc_compositor_init(&c->base, display) < 0)