pepper: Output backends correctly consume damage region

Change-Id: I2a7f4edfa01010e1db45efb243a543fe1b77626c

diff --git a/drm/src/drm-output.c b/drm/src/drm-output.c
index 618af5a..b7fb5dc 100644 (file)
--- a/drm/src/drm-output.c
+++ b/drm/src/drm-output.c
@@ -276,11 +276,7 @@ drm_output_repaint(void *o, const pepper_list_t *plane_list)
 
             pepper_renderer_set_target(output->renderer, output->render_target);
             pepper_renderer_repaint_output(output->renderer, output->base, render_list, damage);
-
-            /* NULL means that whole damage region is updated.
-             * If only visible damage region is updated, pass that region to this function
-             * so that pepper core correctly manage remaining damage region. */
-            pepper_plane_subtract_damage_region(plane, NULL);
+            pepper_plane_clear_damage_region(plane);
 
             update_back_buffer(output);
 

diff --git a/fbdev/src/fbdev-output.c b/fbdev/src/fbdev-output.c
index eb20a24..eb68d9d 100644 (file)
--- a/fbdev/src/fbdev-output.c
+++ b/fbdev/src/fbdev-output.c
@@ -194,6 +194,7 @@ fbdev_output_repaint(void *o, const pepper_list_t *plane_list)
             pixman_region32_t   *damage = pepper_plane_get_damage_region(plane);
 
             pepper_renderer_repaint_output(output->renderer, output->base, render_list, damage);
+            pepper_plane_clear_damage_region(plane);
 
             /* FIXME: composite with damage? */
             if (output->use_shadow)

diff --git a/pepper/src/pepper-output-backend.h b/pepper/src/pepper-output-backend.h
index 223f3d2..082e455 100644 (file)
--- a/pepper/src/pepper-output-backend.h
+++ b/pepper/src/pepper-output-backend.h
@@ -63,6 +63,9 @@ PEPPER_API void
 pepper_plane_subtract_damage_region(pepper_plane_t *plane, pixman_region32_t *damage);
 
 PEPPER_API void
+pepper_plane_clear_damage_region(pepper_plane_t *plane);
+
+PEPPER_API void
 pepper_view_assign_plane(pepper_view_t *view, pepper_output_t *output, pepper_plane_t *plane);
 
 PEPPER_API void

diff --git a/pepper/src/plane.c b/pepper/src/plane.c
index d1f13ef..f2d7e4f 100644 (file)
--- a/pepper/src/plane.c
+++ b/pepper/src/plane.c
@@ -146,3 +146,9 @@ pepper_plane_subtract_damage_region(pepper_plane_t *plane, pixman_region32_t *da
 {
     pixman_region32_subtract(&plane->damage_region, &plane->damage_region, damage);
 }
+
+PEPPER_API void
+pepper_plane_clear_damage_region(pepper_plane_t *plane)
+{
+    pixman_region32_clear(&plane->damage_region);
+}

diff --git a/wayland/src/wayland-output.c b/wayland/src/wayland-output.c
index fc5623c..1105463 100644 (file)
--- a/wayland/src/wayland-output.c
+++ b/wayland/src/wayland-output.c
@@ -197,6 +197,7 @@ wayland_output_repaint(void *o, const pepper_list_t *plane_list)
                 output->render_pre(output);
 
             pepper_renderer_repaint_output(output->renderer, output->base, render_list, damage);
+            pepper_plane_clear_damage_region(plane);
 
             if (output->render_post)
                 output->render_post(output);

diff --git a/x11/src/x11-output.c b/x11/src/x11-output.c
index f04a2d3..2dba69d 100644 (file)
--- a/x11/src/x11-output.c
+++ b/x11/src/x11-output.c
@@ -473,6 +473,7 @@ x11_output_repaint(void *o, const pepper_list_t *plane_list)
 
             pepper_renderer_set_target(output->renderer, output->target);
             pepper_renderer_repaint_output(output->renderer, output->base, render_list, damage);
+            pepper_plane_clear_damage_region(plane);
 
             if (output->renderer == output->connection->pixman_renderer)
             {