compositor: Clear only the the damage that was actually repainted

Instead of clearing the whole output region after a repaint, clear
only the regions that were actually painted. This way, the damage
added when a surface moves from the primary plane to another one is
kept while this region is obscured by the opaque region. This allows
the contents below an overlaid surface to be culled, but to make this
work properly, it is also necessary to change the way previous damage
is drawn.

Consider the following scenario: a surface is moved to an overlay plane
leaving some damage in the primary plane. On the following frame, the
surface on the overlay moves, revealing part of the damaged region on
the primary plane. On the frame after that, the overlaid surface moves
back to its previous position obscuring the region of the primary plane
repainted before. At this point, the repainted region was added to the
output's previous damage so that it is draw to both buffers. But since
this region is now obscured, the redrawing is skipped. If the overlaid
surface moves again revealing this region, one of the buffers actually
contains the wrong content.

To fix this problem, this patch ensures that any previous damage that
would be lost is actually preserved by folding it back into the
primary plane damage just before repainting.

diff --git a/src/compositor.c b/src/compositor.c
index 2efcacc..1bf7c96 100644 (file)
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -930,6 +930,9 @@ weston_surface_draw(struct weston_surface *es, struct weston_output *output,
        if (!pixman_region32_not_empty(&repaint))
                goto out;
 
+       pixman_region32_subtract(&ec->primary_plane.damage,
+                                &ec->primary_plane.damage, &repaint);
+
        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
        if (es->blend || es->alpha < 1.0)
                glEnable(GL_BLEND);
@@ -1124,8 +1127,7 @@ surface_accumulate_damage(struct weston_surface *surface,
                              &surface->plane->damage, &surface->damage);
        empty_region(&surface->damage);
        pixman_region32_copy(&surface->clip, opaque);
-       if (surface->plane == &surface->compositor->primary_plane)
-               pixman_region32_union(opaque, opaque, &surface->transform.opaque);
+       pixman_region32_union(opaque, opaque, &surface->transform.opaque);
 }
 
 static void
@@ -1137,7 +1139,7 @@ weston_output_repaint(struct weston_output *output, uint32_t msecs)
        struct weston_animation *animation, *next;
        struct weston_frame_callback *cb, *cnext;
        struct wl_list frame_callback_list;
-       pixman_region32_t opaque, output_damage;
+       pixman_region32_t opaque, output_damage, new_damage;
        int32_t width, height;
 
        weston_compositor_update_drag_surfaces(ec);
@@ -1169,23 +1171,29 @@ weston_output_repaint(struct weston_output *output, uint32_t msecs)
                wl_list_for_each(es, &ec->surface_list, link)
                        weston_surface_move_to_plane(es, &ec->primary_plane);
 
-
        pixman_region32_init(&opaque);
 
        wl_list_for_each(es, &ec->surface_list, link)
                surface_accumulate_damage(es, &opaque);
 
+       pixman_region32_fini(&opaque);
+
        pixman_region32_init(&output_damage);
-       pixman_region32_union(&output_damage, &ec->primary_plane.damage,
+
+       pixman_region32_init(&new_damage);
+       pixman_region32_copy(&new_damage, &ec->primary_plane.damage);
+
+       pixman_region32_union(&ec->primary_plane.damage,
+                             &ec->primary_plane.damage,
                              &output->previous_damage);
-       pixman_region32_copy(&output->previous_damage,
-                            &ec->primary_plane.damage);
+
+       pixman_region32_intersect(&output->previous_damage,
+                                 &new_damage, &output->region);
+
        pixman_region32_intersect(&output_damage,
-                                 &output_damage, &output->region);
-       pixman_region32_subtract(&ec->primary_plane.damage,
-                                &ec->primary_plane.damage, &output->region);
+                                 &ec->primary_plane.damage, &output->region);
 
-       pixman_region32_fini(&opaque);
+       pixman_region32_fini(&new_damage);
 
        if (output->dirty)
                weston_output_update_matrix(output);