alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix damage being extended after clearing the previous frame (#158)

Browse source 
* Fix damage being extended after clearing the previous frame

* Ensure that damage expansion only occurs if it's smaller than the monitor
This commit is contained in:
Erik Reider 2023-05-19 05:14:37 +02:00 committed by GitHub
parent a160b2c850
commit aa6b2fcd79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/desktop/output.c
View file

@ -692,7 +692,19 @@ static void damage_surface_iterator(struct sway_output *output,
if (view) { if (view) {
int blur_size = view->container->blur_enabled ? config_get_blur_size() : 0; int blur_size = view->container->blur_enabled ? config_get_blur_size() : 0;
if (pixman_region32_not_empty(&damage)) {
int output_width, output_height;
wlr_output_transformed_resolution(output->wlr_output, &output_width, &output_height);
int32_t damage_width = damage.extents.x2 - damage.extents.x1;
int32_t damage_height = damage.extents.y2 - damage.extents.y1;
if (damage_width > output_width || damage_height > output_height) {
pixman_region32_intersect_rect(&damage, &damage, 0, 0, output_width, output_height);
} else {
wlr_region_expand(&damage, &damage, blur_size); wlr_region_expand(&damage, &damage, blur_size);
}
}
box.x -= blur_size; box.x -= blur_size;
box.y -= blur_size; box.y -= blur_size;
box.width += blur_size * 2; box.width += blur_size * 2;

14
sway/desktop/render.c
View file

@ -1770,6 +1770,7 @@ void output_render(struct sway_output *output, struct timespec *when,
if (debug.damage == DAMAGE_RERENDER) { if (debug.damage == DAMAGE_RERENDER) {
pixman_region32_union_rect(damage, damage, 0, 0, output_width, output_height); pixman_region32_union_rect(damage, damage, 0, 0, output_width, output_height);
pixman_region32_copy(&extended_damage, damage);
} }
if (!pixman_region32_not_empty(damage)) { if (!pixman_region32_not_empty(damage)) {
@ -1856,8 +1857,14 @@ void output_render(struct sway_output *output, struct timespec *when,
render_unmanaged(output, damage, &root->xwayland_unmanaged); render_unmanaged(output, damage, &root->xwayland_unmanaged);
#endif #endif
} else { } else {
bool should_render_blur = should_workspace_have_blur(workspace); bool workspace_has_blur = should_workspace_have_blur(workspace);
if (should_render_blur) { if (workspace_has_blur) {
if (config_should_parameters_blur() && renderer->blur_buffer_dirty) {
// Needs to be extended before clearing
pixman_region32_union_rect(damage, damage, 0, 0, output_width, output_height);
pixman_region32_union_rect(&extended_damage, &extended_damage, 0, 0, output_width, output_height);
}
// ensure that the damage isn't expanding past the output's size // ensure that the damage isn't expanding past the output's size
int32_t damage_width = damage->extents.x2 - damage->extents.x1; int32_t damage_width = damage->extents.x2 - damage->extents.x1;
int32_t damage_height = damage->extents.y2 - damage->extents.y1; int32_t damage_height = damage->extents.y2 - damage->extents.y1;
@ -1884,8 +1891,7 @@ void output_render(struct sway_output *output, struct timespec *when,
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]); &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]);
// check if the background needs to be blurred // check if the background needs to be blurred
if (config_should_parameters_blur() && renderer->blur_buffer_dirty && should_render_blur) { if (config_should_parameters_blur() && renderer->blur_buffer_dirty && workspace_has_blur) {
pixman_region32_union_rect(damage, damage, 0, 0, output_width, output_height);
render_output_blur(output, damage); render_output_blur(output, damage);
} }