mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-openwfd: Fixup rebase

Browse Source
This commit is contained in:
Benjamin Franzke
2011-04-20 20:16:25 +02:00
parent 5d00709931
commit e649fac2d8
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/compositor-openwfd.c
+17 -1
View File
@@ -158,6 +158,20 @@ init_egl(struct wfd_compositor *ec)
return 0; return 0;
} }
static int
wfd_output_prepare_scanout_surface(struct wlsc_output *output_base,
struct wlsc_surface *es)
{
return -1;
}
static int
wfd_output_set_cursor(struct wlsc_output *output_base,
struct wl_input_device *input)
{
return -1;
}
static int static int
create_output_for_port(struct wfd_compositor *ec, create_output_for_port(struct wfd_compositor *ec,
WFDHandle port, WFDHandle port,
@@ -289,6 +303,9 @@ create_output_for_port(struct wfd_compositor *ec,
output->base.prepare_render = wfd_output_prepare_render; output->base.prepare_render = wfd_output_prepare_render;
output->base.present = wfd_output_present; output->base.present = wfd_output_present;
output->base.prepare_scanout_surface =
wfd_output_prepare_scanout_surface;
output->base.set_hardware_cursor = wfd_output_set_cursor;
wl_list_insert(ec->base.output_list.prev, &output->base.link); wl_list_insert(ec->base.output_list.prev, &output->base.link);
@@ -533,7 +550,6 @@ wfd_compositor_create(struct wl_display *display, int connector)
} }
ec->base.destroy = wfd_destroy; ec->base.destroy = wfd_destroy;
ec->base.create_buffer = wlsc_shm_buffer_create;
ec->base.focus = 1; ec->base.focus = 1;
glGenFramebuffers(1, &ec->base.fbo); glGenFramebuffers(1, &ec->base.fbo);