compositor: Move repaint loop into a backend function
We've trimmed down the actual repaint loop to just iterating through the
surface list and calling weston_surface_draw(), so we push that to the
backend without too much code duplication.
diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index 1f30e7b..b987a12 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -94,6 +94,19 @@
return 0;
}
+static void
+drm_output_repaint(struct weston_output *output)
+{
+ struct weston_compositor *compositor = output->compositor;
+ struct weston_surface *surface;
+
+ surface = container_of(compositor->surface_list.next,
+ struct weston_surface, link);
+
+ wl_list_for_each_reverse(surface, &compositor->surface_list, link)
+ weston_surface_draw(surface, output);
+}
+
static int
drm_output_present(struct weston_output *output_base)
{
@@ -554,6 +567,7 @@
output->pending_fs_surf_fb_id = 0;
output->base.prepare_render = drm_output_prepare_render;
+ output->base.repaint = drm_output_repaint;
output->base.present = drm_output_present;
output->base.prepare_scanout_surface =
drm_output_prepare_scanout_surface;
diff --git a/src/compositor-openwfd.c b/src/compositor-openwfd.c
index 2299d99..a5bb265 100644
--- a/src/compositor-openwfd.c
+++ b/src/compositor-openwfd.c
@@ -101,6 +101,16 @@
return 0;
}
+static void
+wfd_output_repaint(struct weston_output *output)
+{
+ struct weston_compositor *compositor;
+ struct weston_surface *surface;
+
+ wl_list_for_each_reverse(surface, &compositor->surface_list, link)
+ weston_surface_draw(surface, output);
+}
+
static int
wfd_output_present(struct weston_output *output_base)
{
@@ -407,6 +417,7 @@
wfdDeviceCommit(ec->dev, WFD_COMMIT_ENTIRE_DEVICE, WFD_INVALID_HANDLE);
output->base.prepare_render = wfd_output_prepare_render;
+ output->base.repaint = wfd_output_repaint;
output->base.present = wfd_output_present;
output->base.prepare_scanout_surface =
wfd_output_prepare_scanout_surface;
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 4fa9df1..c909253 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -177,6 +177,16 @@
}
static void
+wayland_output_repaint(struct weston_output *output)
+{
+ struct weston_compositor *compositor = output->compositor;
+ struct weston_surface *surface;
+
+ wl_list_for_each_reverse(surface, &compositor->surface_list, link)
+ weston_surface_draw(surface, output);
+}
+
+static void
frame_done(void *data, struct wl_callback *wl_callback, uint32_t time)
{
struct weston_output *output = data;
@@ -291,6 +301,7 @@
glClearColor(0, 0, 0, 0.5);
output->base.prepare_render = wayland_output_prepare_render;
+ output->base.repaint = wayland_output_repaint;
output->base.present = wayland_output_present;
output->base.prepare_scanout_surface =
wayland_output_prepare_scanout_surface;
diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index 09213f7..771bf69 100644
--- a/src/compositor-x11.c
+++ b/src/compositor-x11.c
@@ -200,6 +200,16 @@
return 0;
}
+static void
+x11_output_repaint(struct weston_output *output)
+{
+ struct weston_compositor *compositor = output->compositor;
+ struct weston_surface *surface;
+
+ wl_list_for_each_reverse(surface, &compositor->surface_list, link)
+ weston_surface_draw(surface, output);
+}
+
static int
finish_frame_handler(void *data)
{
@@ -462,6 +472,7 @@
wl_event_loop_add_timer(loop, finish_frame_handler, output);
output->base.prepare_render = x11_output_prepare_render;
+ output->base.repaint = x11_output_repaint;
output->base.present = x11_output_present;
output->base.prepare_scanout_surface =
x11_output_prepare_scanout_surface;
diff --git a/src/compositor.c b/src/compositor.c
index 3f178ae..93c76c7 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -555,7 +555,7 @@
return 1;
}
-static void
+WL_EXPORT void
weston_surface_draw(struct weston_surface *es, struct weston_output *output)
{
struct weston_compositor *ec = es->compositor;
@@ -861,8 +861,7 @@
/* We're drawing nothing, just let the damage accumulate */
return;
- wl_list_for_each_reverse(es, &ec->surface_list, link)
- weston_surface_draw(es, output);
+ output->repaint(output);
if (ec->fade.spring.current > 0.001)
solid_surface_release(&solid);
diff --git a/src/compositor.h b/src/compositor.h
index 973901e..d7eeae7 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -88,6 +88,7 @@
struct wl_listener pending_scanout_buffer_destroy_listener;
int (*prepare_render)(struct weston_output *output);
+ void (*repaint)(struct weston_output *output);
int (*present)(struct weston_output *output);
int (*prepare_scanout_surface)(struct weston_output *output,
struct weston_surface *es);
@@ -276,6 +277,8 @@
void
weston_surface_activate(struct weston_surface *surface,
struct weston_input_device *device, uint32_t time);
+void
+weston_surface_draw(struct weston_surface *es, struct weston_output *output);
void
notify_motion(struct wl_input_device *device,