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

refactor: removed surface_width + surface_height from render_blur()

Browse source
This commit is contained in:
William McKinnon 2023-06-02 18:39:55 -04:00
parent c95306fcdf
commit 54bb0d154f
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/desktop/render.c
View file

@ -279,8 +279,7 @@ struct fx_framebuffer *get_main_buffer_blur(struct fx_renderer *renderer, struct
void render_blur(bool optimized, struct sway_output *output, void render_blur(bool optimized, struct sway_output *output,
pixman_region32_t *output_damage, const struct wlr_fbox *src_box, pixman_region32_t *output_damage, const struct wlr_fbox *src_box,
const struct wlr_box *dst_box, pixman_region32_t *opaque_region, const struct wlr_box *dst_box, pixman_region32_t *opaque_region,
int surface_width, int surface_height, int32_t surface_scale, int32_t surface_scale, int corner_radius, bool should_round_top) {
int corner_radius, bool should_round_top) {
struct wlr_output *wlr_output = output->wlr_output; struct wlr_output *wlr_output = output->wlr_output;
struct fx_renderer *renderer = output->renderer; struct fx_renderer *renderer = output->renderer;
@ -311,8 +310,8 @@ void render_blur(bool optimized, struct sway_output *output,
pixman_region32_copy(&inverse_opaque, opaque_region); pixman_region32_copy(&inverse_opaque, opaque_region);
pixman_region32_inverse(&inverse_opaque, &inverse_opaque, &surface_box); pixman_region32_inverse(&inverse_opaque, &inverse_opaque, &surface_box);
pixman_region32_intersect_rect(&inverse_opaque, &inverse_opaque, 0, 0, pixman_region32_intersect_rect(&inverse_opaque, &inverse_opaque, 0, 0,
surface_width * surface_scale, dst_box->width * surface_scale,
surface_height * surface_scale); dst_box->height * surface_scale);
if (!pixman_region32_not_empty(&inverse_opaque)) { if (!pixman_region32_not_empty(&inverse_opaque)) {
goto damage_finish; goto damage_finish;
} }
@ -456,8 +455,7 @@ static void render_surface_iterator(struct sway_output *output,
wlr_output_transform_invert(wlr_output->transform), monitor_box.width, monitor_box.height); wlr_output_transform_invert(wlr_output->transform), monitor_box.width, monitor_box.height);
struct wlr_fbox blur_src_box = wlr_fbox_from_wlr_box(&monitor_box); struct wlr_fbox blur_src_box = wlr_fbox_from_wlr_box(&monitor_box);
render_blur(should_optimize_blur, output, output_damage, &blur_src_box, &dst_box, &opaque_region, render_blur(should_optimize_blur, output, output_damage, &blur_src_box, &dst_box, &opaque_region,
surface->current.width, surface->current.height, surface->current.scale, surface->current.scale, deco_data.corner_radius, deco_data.has_titlebar);
deco_data.corner_radius, deco_data.has_titlebar);
} }
pixman_region32_fini(&opaque_region); pixman_region32_fini(&opaque_region);
@ -812,7 +810,7 @@ static void render_saved_view(struct sway_view *view, struct sway_output *output
struct wlr_fbox src_box = wlr_fbox_from_wlr_box(&monitor_box); struct wlr_fbox src_box = wlr_fbox_from_wlr_box(&monitor_box);
bool should_optimize_blur = !container_is_floating(view->container) || config->blur_xray; bool should_optimize_blur = !container_is_floating(view->container) || config->blur_xray;
render_blur(should_optimize_blur, output, damage, &src_box, &dst_box, &opaque_region, render_blur(should_optimize_blur, output, damage, &src_box, &dst_box, &opaque_region,
saved_buf->width, saved_buf->height, 1, deco_data.corner_radius, deco_data.has_titlebar); 1, deco_data.corner_radius, deco_data.has_titlebar);
pixman_region32_fini(&opaque_region); pixman_region32_fini(&opaque_region);
} }