hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-02 03:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

scene: fix output damage expansion condition

Browse source 
Now, it is checked whether an output pixel corresponds to an integer
number of buffer pixels; if it doesn't, the region is altered to take
this into account.
This commit is contained in:
Kirill Primak 2022-11-27 12:41:22 +03:00 committed by Alexander Orzechowski
parent d2238bf722
commit 5477ad7d90
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
types/scene/wlr_scene.c
View file

@ -647,17 +647,24 @@ void wlr_scene_buffer_set_buffer_with_damage(struct wlr_scene_buffer *scene_buff
wlr_region_scale_xy(&output_damage, &trans_damage, wlr_region_scale_xy(&output_damage, &trans_damage,
output_scale_x, output_scale_y); output_scale_x, output_scale_y);
// One buffer pixel will match (output_scale_x)x(output_scale_y) output // One output pixel will match (buffer_scale_x)x(buffer_scale_y) buffer pixels.
// pixels. If max(output_scale_x, output_scale_y) is bigger than 1, // If the buffer is upscaled on the given axis (output_scale_* > 1.0,
// the result will be blurry, and with linear filtering, will bleed into // buffer_scale_* < 1.0), its contents will bleed into adjacent
// adjacent (output_scale_x / 2) pixels on X axis and (output_scale_y / 2) // (ceil(output_scale_* / 2)) output pixels because of linear filtering.
// pixels on Y axis. To fix this, the damage region is expanded by largest // Additionally, if the buffer is downscaled (output_scale_* < 1.0,
// distance of the two. // buffer_scale_* > 1.0), and one output pixel matches a non-integer number of
float bigger_scale = fmaxf(output_scale_x, output_scale_y); // buffer pixels, its contents will bleed into neighboring output pixels.
if (bigger_scale > 1.0f) { // Handle both cases by computing buffer_scale_{x,y} and checking if they are
// integer numbers; ceilf() is used to ensure that the distance is at least 1.
float buffer_scale_x = 1.0f / output_scale_x;
float buffer_scale_y = 1.0f / output_scale_y;
int dist_x = floor(buffer_scale_x) != buffer_scale_x ?
(int)ceilf(output_scale_x / 2.0f) : 0;
int dist_y = floor(buffer_scale_y) != buffer_scale_y ?
(int)ceilf(output_scale_y / 2.0f) : 0;
// TODO: expand with per-axis distances
wlr_region_expand(&output_damage, &output_damage, wlr_region_expand(&output_damage, &output_damage,
ceilf(bigger_scale / 2.0f)); dist_x >= dist_y ? dist_x : dist_y);
}
pixman_region32_t cull_region; pixman_region32_t cull_region;
pixman_region32_init(&cull_region); pixman_region32_init(&cull_region);