aboutsummaryrefslogtreecommitdiffstats
path: root/sway/desktop/render.c
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-12-01 11:01:08 +0100
committerLibravatar emersion <contact@emersion.fr>2018-12-01 11:01:08 +0100
commited7bd683a763eebfac9278ffafa9c4537771d84b (patch)
treec882e216b53170367fb32d67e3eb4546ed5ca001 /sway/desktop/render.c
parentMerge pull request #3226 from CameronNemo/musl (diff)
downloadsway-ed7bd683a763eebfac9278ffafa9c4537771d84b.tar.gz
sway-ed7bd683a763eebfac9278ffafa9c4537771d84b.tar.zst
sway-ed7bd683a763eebfac9278ffafa9c4537771d84b.zip
Update for swaywm/wlroots#1403
Diffstat (limited to 'sway/desktop/render.c')
-rw-r--r--sway/desktop/render.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index ca8ef83b..2afed82d 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -1079,15 +1079,22 @@ renderer_end:
1079 wlr_render_texture(renderer, root->debug_tree, 1079 wlr_render_texture(renderer, root->debug_tree,
1080 wlr_output->transform_matrix, 0, 40, 1); 1080 wlr_output->transform_matrix, 0, 40, 1);
1081 } 1081 }
1082 if (debug.damage == DAMAGE_HIGHLIGHT) {
1083 int width, height;
1084 wlr_output_transformed_resolution(wlr_output, &width, &height);
1085 pixman_region32_union_rect(damage, damage, 0, 0, width, height);
1086 }
1087 1082
1088 wlr_renderer_scissor(renderer, NULL); 1083 wlr_renderer_scissor(renderer, NULL);
1089 wlr_output_render_software_cursors(wlr_output, damage); 1084 wlr_output_render_software_cursors(wlr_output, damage);
1090 wlr_renderer_end(renderer); 1085 wlr_renderer_end(renderer);
1086
1087 int width, height;
1088 wlr_output_transformed_resolution(wlr_output, &width, &height);
1089
1090 if (debug.damage == DAMAGE_HIGHLIGHT) {
1091 pixman_region32_union_rect(damage, damage, 0, 0, width, height);
1092 }
1093
1094 enum wl_output_transform transform =
1095 wlr_output_transform_invert(wlr_output->transform);
1096 wlr_region_transform(damage, damage, transform, width, height);
1097
1091 if (!wlr_output_damage_swap_buffers(output->damage, when, damage)) { 1098 if (!wlr_output_damage_swap_buffers(output->damage, when, damage)) {
1092 return; 1099 return;
1093 } 1100 }