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

compositor: Combine repaint and weston_output_repaint

Browse Source 
Fewer repaint functions is better.
This commit is contained in:
Kristian Høgsberg
2012-01-26 08:40:37 -05:00
parent a82c4860a1
commit 30c018be3a
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+11 -19
View File
@@ -766,11 +766,18 @@ out:
pixman_region32_fini(&cursor_region); pixman_region32_fini(&cursor_region);
} }
struct weston_frame_callback {
struct wl_resource resource;
struct wl_list link;
};
static void static void
weston_output_repaint(struct weston_output *output) weston_output_repaint(struct weston_output *output, int msecs)
{ {
struct weston_compositor *ec = output->compositor; struct weston_compositor *ec = output->compositor;
struct weston_surface *es, solid; struct weston_surface *es, solid;
struct weston_animation *animation, *next;
struct weston_frame_callback *cb, *cnext;
pixman_region32_t opaque, new_damage, total_damage, pixman_region32_t opaque, new_damage, total_damage,
overlap, surface_overlap; overlap, surface_overlap;
@@ -824,21 +831,7 @@ weston_output_repaint(struct weston_output *output)
solid_surface_release(&solid); solid_surface_release(&solid);
pixman_region32_fini(&total_damage); pixman_region32_fini(&total_damage);
}
struct weston_frame_callback {
struct wl_resource resource;
struct wl_list link;
};
static void
repaint(struct weston_output *output, int msecs)
{
struct weston_compositor *compositor = output->compositor;
struct weston_animation *animation, *next;
struct weston_frame_callback *cb, *cnext;
weston_output_repaint(output);
output->repaint_needed = 0; output->repaint_needed = 0;
output->repaint_scheduled = 1; output->repaint_scheduled = 1;
@@ -847,8 +840,7 @@ repaint(struct weston_output *output, int msecs)
wl_resource_destroy(&cb->resource, 0); wl_resource_destroy(&cb->resource, 0);
} }
wl_list_for_each_safe(animation, next, wl_list_for_each_safe(animation, next, &ec->animation_list, link)
&compositor->animation_list, link)
animation->frame(animation, output, msecs); animation->frame(animation, output, msecs);
} }
@@ -859,14 +851,14 @@ idle_repaint(void *data)
/* An idle repaint may have been cancelled by vt switching away. */ /* An idle repaint may have been cancelled by vt switching away. */
if (output->repaint_needed) if (output->repaint_needed)
repaint(output, weston_compositor_get_time()); weston_output_repaint(output, weston_compositor_get_time());
} }
WL_EXPORT void WL_EXPORT void
weston_output_finish_frame(struct weston_output *output, int msecs) weston_output_finish_frame(struct weston_output *output, int msecs)
{ {
if (output->repaint_needed) if (output->repaint_needed)
repaint(output, msecs); weston_output_repaint(output, msecs);
else else
output->repaint_scheduled = 0; output->repaint_scheduled = 0;
} }