Merge pull request #1923 from emersion/full-damage-tracking

Implement full damage tracking

4 files changed, 210 insertions, 113 deletions

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 9b0f1ae3..c150270e 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -163,14 +163,65 @@ static void scale_box(struct wlr_box *box, float scale) {
 struct render_data {
         struct root_geometry root_geo;
         struct sway_output *output;
+        pixman_region32_t *damage;
         float alpha;
 };
 
+static void scissor_output(struct wlr_output *wlr_output,
+                pixman_box32_t *rect) {
+        struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend);
+        assert(renderer);
+
+        struct wlr_box box = {
+                .x = rect->x1,
+                .y = rect->y1,
+                .width = rect->x2 - rect->x1,
+                .height = rect->y2 - rect->y1,
+        };
+
+        int ow, oh;
+        wlr_output_transformed_resolution(wlr_output, &ow, &oh);
+
+        enum wl_output_transform transform =
+                wlr_output_transform_invert(wlr_output->transform);
+        wlr_box_transform(&box, transform, ow, oh, &box);
+
+        wlr_renderer_scissor(renderer, &box);
+}
+
+static void render_texture(struct wlr_output *wlr_output,
+                pixman_region32_t *output_damage, struct wlr_texture *texture,
+                const struct wlr_box *box, const float matrix[static 9], float alpha) {
+        struct wlr_renderer *renderer =
+                wlr_backend_get_renderer(wlr_output->backend);
+
+        pixman_region32_t damage;
+        pixman_region32_init(&damage);
+        pixman_region32_union_rect(&damage, &damage, box->x, box->y,
+                box->width, box->height);
+        pixman_region32_intersect(&damage, &damage, output_damage);
+        bool damaged = pixman_region32_not_empty(&damage);
+        if (!damaged) {
+                goto damage_finish;
+        }
+
+        int nrects;
+        pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
+        for (int i = 0; i < nrects; ++i) {
+                scissor_output(wlr_output, &rects[i]);
+                wlr_render_texture_with_matrix(renderer, texture, matrix, alpha);
+        }
+
+damage_finish:
+        pixman_region32_fini(&damage);
+}
+
 static void render_surface_iterator(struct wlr_surface *surface, int sx, int sy,
                 void *_data) {
         struct render_data *data = _data;
         struct wlr_output *wlr_output = data->output->wlr_output;
         float rotation = data->root_geo.rotation;
+        pixman_region32_t *output_damage = data->damage;
         float alpha = data->alpha;
 
         if (!wlr_surface_has_buffer(surface)) {
@@ -184,13 +235,6 @@ static void render_surface_iterator(struct wlr_surface *surface, int sx, int sy,
                 return;
         }
 
-        struct wlr_renderer *renderer =
-                wlr_backend_get_renderer(wlr_output->backend);
-        if (!sway_assert(renderer != NULL,
-                        "expected the output backend to have a renderer")) {
-                return;
-        }
-
         scale_box(&box, wlr_output->scale);
 
         float matrix[9];
@@ -199,38 +243,81 @@ static void render_surface_iterator(struct wlr_surface *surface, int sx, int sy,
         wlr_matrix_project_box(matrix, &box, transform, rotation,
                 wlr_output->transform_matrix);
 
-        wlr_render_texture_with_matrix(renderer, surface->texture,
-                matrix, alpha);
+        render_texture(wlr_output, output_damage, surface->texture, &box, matrix,
+                alpha);
 }
 
 static void render_layer(struct sway_output *output,
-                struct wl_list *layer_surfaces) {
-        struct render_data data = { .output = output, .alpha = 1.0f };
+                pixman_region32_t *damage, struct wl_list *layer_surfaces) {
+        struct render_data data = {
+                .output = output,
+                .damage = damage,
+                .alpha = 1.0f,
+        };
         layer_for_each_surface(layer_surfaces, &data.root_geo,
                 render_surface_iterator, &data);
 }
 
 static void render_unmanaged(struct sway_output *output,
-                struct wl_list *unmanaged) {
-        struct render_data data = { .output = output, .alpha = 1.0f };
+                pixman_region32_t *damage, struct wl_list *unmanaged) {
+        struct render_data data = {
+                .output = output,
+                .damage = damage,
+                .alpha = 1.0f,
+        };
         unmanaged_for_each_surface(unmanaged, output, &data.root_geo,
                 render_surface_iterator, &data);
 }
 
-static void render_view(struct sway_view *view, struct sway_output *output) {
-        struct render_data data = { .output = output, .alpha = view->swayc->alpha };
+static void render_view(struct sway_view *view, struct sway_output *output,
+                pixman_region32_t *damage) {
+        struct render_data data = {
+                .output = output,
+                .damage = damage,
+                .alpha = view->swayc->alpha,
+        };
         output_view_for_each_surface(
                         view, &data.root_geo, render_surface_iterator, &data);
 }
 
+static void render_rect(struct wlr_output *wlr_output,
+                pixman_region32_t *output_damage, const struct wlr_box *_box,
+                float color[static 4]) {
+        struct wlr_renderer *renderer =
+                wlr_backend_get_renderer(wlr_output->backend);
+
+        struct wlr_box box = *_box;
+        scale_box(&box, wlr_output->scale);
+
+        pixman_region32_t damage;
+        pixman_region32_init(&damage);
+        pixman_region32_union_rect(&damage, &damage, box.x, box.y,
+                box.width, box.height);
+        pixman_region32_intersect(&damage, &damage, output_damage);
+        bool damaged = pixman_region32_not_empty(&damage);
+        if (!damaged) {
+                goto damage_finish;
+        }
+
+        int nrects;
+        pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
+        for (int i = 0; i < nrects; ++i) {
+                scissor_output(wlr_output, &rects[i]);
+                wlr_render_rect(renderer, &box, color,
+                        wlr_output->transform_matrix);
+        }
+
+damage_finish:
+        pixman_region32_fini(&damage);
+}
+
 /**
  * Render decorations for a view with "border normal".
  */
 static void render_container_simple_border_normal(struct sway_output *output,
+                pixman_region32_t *output_damage,
                 struct sway_container *con, struct border_colors *colors,
                 struct wlr_texture *title_texture) {
-        struct wlr_renderer *renderer =
-                wlr_backend_get_renderer(output->wlr_output->backend);
         struct wlr_box box;
         float color[4];
 
@@ -241,9 +328,7 @@ static void render_container_simple_border_normal(struct sway_output *output,
         box.y = con->y + 1;
         box.width = con->sway_view->border_thickness;
         box.height = con->height - 1;
-        scale_box(&box, output->wlr_output->scale);
-        wlr_render_rect(renderer, &box, color,
-                        output->wlr_output->transform_matrix);
+        render_rect(output->wlr_output, output_damage, &box, color);
 
         // Child border - right edge
         if (con->parent->children->length == 1 && con->parent->layout == L_HORIZ) {
@@ -256,9 +341,7 @@ static void render_container_simple_border_normal(struct sway_output *output,
         box.y = con->y + 1;
         box.width = con->sway_view->border_thickness;
         box.height = con->height - 1;
-        scale_box(&box, output->wlr_output->scale);
-        wlr_render_rect(renderer, &box, color,
-                        output->wlr_output->transform_matrix);
+        render_rect(output->wlr_output, output_damage, &box, color);
 
         // Child border - bottom edge
         if (con->parent->children->length == 1 && con->parent->layout == L_VERT) {
@@ -271,9 +354,7 @@ static void render_container_simple_border_normal(struct sway_output *output,
         box.y = con->y + con->height - con->sway_view->border_thickness;
         box.width = con->width;
         box.height = con->sway_view->border_thickness;
-        scale_box(&box, output->wlr_output->scale);
-        wlr_render_rect(renderer, &box, color,
-                        output->wlr_output->transform_matrix);
+        render_rect(output->wlr_output, output_damage, &box, color);
 
         // Single pixel bar above title
         memcpy(&color, colors->border, sizeof(float) * 4);
@@ -282,18 +363,14 @@ static void render_container_simple_border_normal(struct sway_output *output,
         box.y = con->y;
         box.width = con->width;
         box.height = 1;
-        scale_box(&box, output->wlr_output->scale);
-        wlr_render_rect(renderer, &box, color,
-                        output->wlr_output->transform_matrix);
+        render_rect(output->wlr_output, output_damage, &box, color);
 
         // Single pixel bar below title
         box.x = con->x + con->sway_view->border_thickness;
         box.y = con->sway_view->y - 1;
         box.width = con->width - con->sway_view->border_thickness * 2;
         box.height = 1;
-        scale_box(&box, output->wlr_output->scale);
-        wlr_render_rect(renderer, &box, color,
-                        output->wlr_output->transform_matrix);
+        render_rect(output->wlr_output, output_damage, &box, color);
 
         // Title background
         memcpy(&color, colors->background, sizeof(float) * 4);
@@ -302,20 +379,24 @@ static void render_container_simple_border_normal(struct sway_output *output,
         box.y = con->y + 1;
         box.width = con->width - con->sway_view->border_thickness * 2;
         box.height = con->sway_view->y - con->y - 2;
-        scale_box(&box, output->wlr_output->scale);
-        wlr_render_rect(renderer, &box, color,
-                        output->wlr_output->transform_matrix);
+        render_rect(output->wlr_output, output_damage, &box, color);
 
         // Title text
         if (title_texture) {
-                struct wlr_box scissor_box;
-                wlr_box_transform(&box,
-                                wlr_output_transform_invert(output->wlr_output->transform),
-                                output->swayc->width, output->swayc->height, &scissor_box);
-                wlr_renderer_scissor(renderer, &scissor_box);
-                wlr_render_texture(renderer, title_texture,
-                                output->wlr_output->transform_matrix, box.x, box.y, 1);
-                wlr_renderer_scissor(renderer, NULL);
+                float output_scale = output->wlr_output->scale;
+                struct wlr_box texture_box = {
+                        .x = box.x * output_scale,
+                        .y = box.y * output_scale,
+                };
+                wlr_texture_get_size(title_texture,
+                        &texture_box.width, &texture_box.height);
+
+                float matrix[9];
+                wlr_matrix_project_box(matrix, &texture_box, WL_OUTPUT_TRANSFORM_NORMAL,
+                        0.0, output->wlr_output->transform_matrix);
+
+                render_texture(output->wlr_output, output_damage, title_texture,
+                        &texture_box, matrix, 1.0);
         }
 }
 
@@ -323,9 +404,8 @@ static void render_container_simple_border_normal(struct sway_output *output,
  * Render decorations for a view with "border pixel".
  */
 static void render_container_simple_border_pixel(struct sway_output *output,
-                struct sway_container *con, struct border_colors *colors) {
-        struct wlr_renderer *renderer =
-                wlr_backend_get_renderer(output->wlr_output->backend);
+                pixman_region32_t *output_damage, struct sway_container *con,
+                struct border_colors *colors) {
         struct wlr_box box;
         float color[4];
 
@@ -336,9 +416,7 @@ static void render_container_simple_border_pixel(struct sway_output *output,
         box.y = con->y;
         box.width = con->sway_view->border_thickness;
         box.height = con->height;
-        scale_box(&box, output->wlr_output->scale);
-        wlr_render_rect(renderer, &box, color,
-                        output->wlr_output->transform_matrix);
+        render_rect(output->wlr_output, output_damage, &box, color);
 
         // Child border - right edge
         if (con->parent->children->length == 1 && con->parent->layout == L_HORIZ) {
@@ -351,18 +429,14 @@ static void render_container_simple_border_pixel(struct sway_output *output,
         box.y = con->y;
         box.width = con->sway_view->border_thickness;
         box.height = con->height;
-        scale_box(&box, output->wlr_output->scale);
-        wlr_render_rect(renderer, &box, color,
-                        output->wlr_output->transform_matrix);
+        render_rect(output->wlr_output, output_damage, &box, color);
 
         // Child border - top edge
         box.x = con->x;
         box.y = con->y;
         box.width = con->width;
         box.height = con->sway_view->border_thickness;
-        scale_box(&box, output->wlr_output->scale);
-        wlr_render_rect(renderer, &box, color,
-                        output->wlr_output->transform_matrix);
+        render_rect(output->wlr_output, output_damage, &box, color);
 
         // Child border - bottom edge
         if (con->parent->children->length == 1 && con->parent->layout == L_VERT) {
@@ -375,13 +449,11 @@ static void render_container_simple_border_pixel(struct sway_output *output,
         box.y = con->y + con->height - con->sway_view->border_thickness;
         box.width = con->width;
         box.height = con->sway_view->border_thickness;
-        scale_box(&box, output->wlr_output->scale);
-        wlr_render_rect(renderer, &box, color,
-                        output->wlr_output->transform_matrix);
+        render_rect(output->wlr_output, output_damage, &box, color);
 }
 
 static void render_container(struct sway_output *output,
-                struct sway_container *con);
+        pixman_region32_t *damage, struct sway_container *con);
 
 /**
  * Render a container's children using a L_HORIZ or L_VERT layout.
@@ -390,7 +462,7 @@ static void render_container(struct sway_output *output,
  * they'll apply their own borders to their children.
  */
 static void render_container_simple(struct sway_output *output,
-                struct sway_container *con) {
+                pixman_region32_t *damage, struct sway_container *con) {
         struct sway_seat *seat = input_manager_current_seat(input_manager);
         struct sway_container *focus = seat_get_focus(seat);
 
@@ -413,15 +485,16 @@ static void render_container_simple(struct sway_output *output,
                                 }
 
                                 if (child->sway_view->border == B_NORMAL) {
-                                        render_container_simple_border_normal(output, child,
-                                                        colors, title_texture);
+                                        render_container_simple_border_normal(output, damage,
+                                                child, colors, title_texture);
                                 } else {
-                                        render_container_simple_border_pixel(output, child, colors);
+                                        render_container_simple_border_pixel(output, damage, child,
+                                                colors);
                                 }
                         }
-                        render_view(child->sway_view, output);
+                        render_view(child->sway_view, output, damage);
                 } else {
-                        render_container(output, child);
+                        render_container(output, damage, child);
                 }
         }
 }
@@ -430,7 +503,7 @@ static void render_container_simple(struct sway_output *output,
  * Render a container's children using the L_TABBED layout.
  */
 static void render_container_tabbed(struct sway_output *output,
-                struct sway_container *con) {
+                pixman_region32_t *damage, struct sway_container *con) {
         // TODO
 }
 
@@ -438,23 +511,23 @@ static void render_container_tabbed(struct sway_output *output,
  * Render a container's children using the L_STACKED layout.
  */
 static void render_container_stacked(struct sway_output *output,
-                struct sway_container *con) {
+                pixman_region32_t *damage, struct sway_container *con) {
         // TODO
 }
 
 static void render_container(struct sway_output *output,
-                struct sway_container *con) {
+                pixman_region32_t *damage, struct sway_container *con) {
         switch (con->layout) {
         case L_NONE:
         case L_HORIZ:
         case L_VERT:
-                render_container_simple(output, con);
+                render_container_simple(output, damage, con);
                 break;
         case L_STACKED:
-                render_container_stacked(output, con);
+                render_container_stacked(output, damage, con);
                 break;
         case L_TABBED:
-                render_container_tabbed(output, con);
+                render_container_tabbed(output, damage, con);
                 break;
         case L_FLOATING:
                 // TODO
@@ -496,37 +569,51 @@ static void render_output(struct sway_output *output, struct timespec *when,
                 goto renderer_end;
         }
 
-        // TODO: don't damage the whole output
-        int width, height;
-        wlr_output_transformed_resolution(wlr_output, &width, &height);
-        pixman_region32_union_rect(damage, damage, 0, 0, width, height);
+        //wlr_renderer_clear(renderer, (float[]){1, 1, 0, 1});
 
         struct sway_container *workspace = output_get_active_workspace(output);
 
         if (workspace->sway_workspace->fullscreen) {
                 float clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f};
-                wlr_renderer_clear(renderer, clear_color);
+
+                int nrects;
+                pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects);
+                for (int i = 0; i < nrects; ++i) {
+                        scissor_output(wlr_output, &rects[i]);
+                        wlr_renderer_clear(renderer, clear_color);
+                }
+
                 // TODO: handle views smaller than the output
-                render_view(workspace->sway_workspace->fullscreen, output);
+                render_view(workspace->sway_workspace->fullscreen, output, damage);
 
                 if (workspace->sway_workspace->fullscreen->type == SWAY_VIEW_XWAYLAND) {
-                        render_unmanaged(output,
-                                        &root_container.sway_root->xwayland_unmanaged);
+                        render_unmanaged(output, damage,
+                                &root_container.sway_root->xwayland_unmanaged);
                 }
         } else {
                 float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f};
-                wlr_renderer_clear(renderer, clear_color);
 
-                render_layer(output,
-                                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND]);
-                render_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]);
+                int nrects;
+                pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects);
+                for (int i = 0; i < nrects; ++i) {
+                        scissor_output(wlr_output, &rects[i]);
+                        wlr_renderer_clear(renderer, clear_color);
+                }
+
+                render_layer(output, damage,
+                        &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND]);
+                render_layer(output, damage,
+                        &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]);
 
-                render_container(output, workspace);
+                render_container(output, damage, workspace);
 
-                render_unmanaged(output, &root_container.sway_root->xwayland_unmanaged);
-                render_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
+                render_unmanaged(output, damage,
+                        &root_container.sway_root->xwayland_unmanaged);
+                render_layer(output, damage,
+                        &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
         }
-        render_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
+        render_layer(output, damage,
+                &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
 
 renderer_end:
         if (root_container.sway_root->debug_tree) {
@@ -534,6 +621,7 @@ renderer_end:
                         wlr_output->transform_matrix, 0, 0, 1);
         }
 
+        wlr_renderer_scissor(renderer, NULL);
         wlr_renderer_end(renderer);
         if (!wlr_output_damage_swap_buffers(output->damage, when, damage)) {
                 return;
@@ -663,28 +751,28 @@ static void damage_surface_iterator(struct wlr_surface *surface, int sx, int sy,
 
         scale_box(&box, output->wlr_output->scale);
 
+        int center_x = box.x + box.width/2;
+        int center_y = box.y + box.height/2;
+
+        pixman_region32_t damage;
+        pixman_region32_init(&damage);
+        pixman_region32_copy(&damage, &surface->current->surface_damage);
+        wlr_region_scale(&damage, &damage, output->wlr_output->scale);
+        if (ceil(output->wlr_output->scale) > surface->current->scale) {
+                // When scaling up a surface, it'll become blurry so we need to
+                // expand the damage region
+                wlr_region_expand(&damage, &damage,
+                        ceil(output->wlr_output->scale) - surface->current->scale);
+        }
+        pixman_region32_translate(&damage, box.x, box.y);
+        wlr_region_rotated_bounds(&damage, &damage, rotation,
+                center_x, center_y);
+        wlr_output_damage_add(output->damage, &damage);
+        pixman_region32_fini(&damage);
+
         if (whole) {
                 wlr_box_rotated_bounds(&box, rotation, &box);
                 wlr_output_damage_add_box(output->damage, &box);
-        } else {
-                int center_x = box.x + box.width/2;
-                int center_y = box.y + box.height/2;
-
-                pixman_region32_t damage;
-                pixman_region32_init(&damage);
-                pixman_region32_copy(&damage, &surface->current->surface_damage);
-                wlr_region_scale(&damage, &damage, output->wlr_output->scale);
-                if (ceil(output->wlr_output->scale) > surface->current->scale) {
-                        // When scaling up a surface, it'll become blurry so we need to
-                        // expand the damage region
-                        wlr_region_expand(&damage, &damage,
-                                ceil(output->wlr_output->scale) - surface->current->scale);
-                }
-                pixman_region32_translate(&damage, box.x, box.y);
-                wlr_region_rotated_bounds(&damage, &damage, rotation,
-                        center_x, center_y);
-                wlr_output_damage_add(output->damage, &damage);
-                pixman_region32_fini(&damage);
         }
 }
 
@@ -699,8 +787,8 @@ void output_damage_surface(struct sway_output *output, double ox, double oy,
                 damage_surface_iterator, &data);
 }
 
-void output_damage_view(struct sway_output *output, struct sway_view *view,
-                bool whole) {
+static void output_damage_view(struct sway_output *output,
+                struct sway_view *view, bool whole) {
         if (!sway_assert(view->swayc != NULL, "expected a view in the tree")) {
                 return;
         }
@@ -720,6 +808,11 @@ void output_damage_view(struct sway_output *output, struct sway_view *view,
                 damage_surface_iterator, &data);
 }
 
+void output_damage_from_view(struct sway_output *output,
+                struct sway_view *view) {
+        output_damage_view(output, view, false);
+}
+
 static void output_damage_whole_container_iterator(struct sway_container *con,
                 void *data) {
         struct sway_output *output = data;
@@ -742,8 +835,12 @@ void output_damage_whole_container(struct sway_output *output,
         };
         wlr_output_damage_add_box(output->damage, &box);
 
-        container_descendants(con, C_VIEW, output_damage_whole_container_iterator,
-                output);
+        if (con->type == C_VIEW) {
+                output_damage_whole_container_iterator(con, output);
+        } else {
+                container_descendants(con, C_VIEW,
+                        output_damage_whole_container_iterator, output);
+        }
 }
 
 static void damage_handle_destroy(struct wl_listener *listener, void *data) {
diff --git a/sway/desktop/wl_shell.c b/sway/desktop/wl_shell.c
index e97a898e..99e8947b 100644
--- a/sway/desktop/wl_shell.c
+++ b/sway/desktop/wl_shell.c
@@ -85,7 +85,7 @@ static void handle_commit(struct wl_listener *listener, void *data) {
         // TODO: Let floating views do whatever
         view_update_size(view, wl_shell_view->pending_width,
                 wl_shell_view->pending_height);
-        view_damage(view, false);
+        view_damage_from(view);
 }
 
 static void handle_destroy(struct wl_listener *listener, void *data) {
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index fcee8ce9..8ecb330d 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -177,7 +177,7 @@ static void handle_commit(struct wl_listener *listener, void *data) {
         view_update_size(view, xdg_shell_v6_view->pending_width,
                 xdg_shell_v6_view->pending_height);
         view_update_title(view, false);
-        view_damage(view, false);
+        view_damage_from(view);
 }
 
 static void handle_new_popup(struct wl_listener *listener, void *data) {
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index b4eda71f..8f935760 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -222,7 +222,7 @@ static void handle_commit(struct wl_listener *listener, void *data) {
         // TODO: Let floating views do whatever
         view_update_size(view, xwayland_view->pending_width,
                 xwayland_view->pending_height);
-        view_damage(view, false);
+        view_damage_from(view);
         view_update_title(view, false);
 }