diff --git a/include/sway/config.h b/include/sway/config.h index 8dcf6a32..cabc9cf5 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -761,8 +761,6 @@ void translate_keysyms(struct input_config *input_config); void binding_add_translated(struct sway_binding *binding, list_t *bindings); -int get_config_blur_size(); - /* Global config singleton. */ extern struct sway_config *config; diff --git a/sway/config.c b/sway/config.c index 43201bf4..85e53679 100644 --- a/sway/config.c +++ b/sway/config.c @@ -1084,7 +1084,3 @@ void translate_keysyms(struct input_config *input_config) { sway_log(SWAY_DEBUG, "Translated keysyms using config for device '%s'", input_config->identifier); } - -int get_config_blur_size() { - return pow(2, config->blur_params.num_passes) * config->blur_params.radius; -} diff --git a/sway/desktop/output.c b/sway/desktop/output.c index a27dc51d..704c3917 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -746,7 +746,8 @@ static void damage_child_views_iterator(struct sway_container *con, void output_damage_whole_container(struct sway_output *output, struct sway_container *con) { int shadow_sigma = con->shadow_enabled ? config->shadow_blur_sigma : 0; - int blur_size = con->blur_enabled ? get_config_blur_size() : 0; + int blur_size = con->blur_enabled ? + pow(2, config->blur_params.num_passes) * config->blur_params.radius : 0; // +1 as a margin of error int effect_size = MAX(shadow_sigma, blur_size) + 1; diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 9903e781..96f68680 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -246,7 +246,6 @@ struct fx_framebuffer *get_main_buffer_blur(struct fx_renderer *renderer, struct pixman_region32_copy(&damage, original_damage); wlr_region_transform(&damage, &damage, transform, monitor_box.width, monitor_box.height); - wlr_region_expand(&damage, &damage, get_config_blur_size()); // Initially blur main_buffer content into the effects_buffers struct fx_framebuffer *current_buffer = &renderer->main_buffer;