From 7f0883b383b73af7bc68dcf8c2ee845c5eab5807 Mon Sep 17 00:00:00 2001 From: Erik Reider <35975961+ErikReider@users.noreply.github.com> Date: Tue, 27 Feb 2024 18:05:58 +0100 Subject: [FX Renderer] Add blur (#30) * Initial blur implementation * Added additional blur effects from SwayFX * Simplified blur pass functions to match the other pass functions * Minor fixes * Added support for optimized blur * tinywl: Don't set decoration values every frame * Updated public blur function docs * Simplified blur buffer management * Moved ignore transparent bool into a per buffer option * Clip the scene_buffer when blur is enabled * Added back corner and shadow checks in opaque_region function * Renamed fx_render_blur_options to fx_render_blur_pass_options * Fixed nits * Removed unused fx_framebuffer_bind_wlr_fbo function * Removed wlr_scene impl. Should be moved into future PR instead * Made blur impl independent of wlr_scene * Moved shader init back into fx_renderer.c * Renamed fx_framebuffer_get_or_create_bufferless to fx_framebuffer_get_or_create_custom --- include/render/pass.h | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) (limited to 'include/render/pass.h') diff --git a/include/render/pass.h b/include/render/pass.h index 52666fe..db33ff6 100644 --- a/include/render/pass.h +++ b/include/render/pass.h @@ -20,14 +20,16 @@ struct fx_gles_render_pass { * Callers must call wlr_render_pass_submit() once they are done with the * render pass. */ -struct fx_gles_render_pass *fx_renderer_begin_buffer_pass(struct wlr_renderer *renderer, - struct wlr_buffer *buffer, const struct wlr_buffer_pass_options *options); +struct fx_gles_render_pass *fx_renderer_begin_buffer_pass(struct wlr_renderer *wlr_renderer, + struct wlr_buffer *wlr_buffer, struct wlr_output *output, + const struct wlr_buffer_pass_options *options); struct fx_render_texture_options { struct wlr_render_texture_options base; float scale; struct wlr_box *clip_box; // Used to clip csd. Ignored if NULL int corner_radius; + bool discard_transparent; }; struct fx_render_texture_options fx_render_texture_options_default( @@ -41,6 +43,17 @@ struct fx_render_rect_options { struct fx_render_rect_options fx_render_rect_options_default( const struct wlr_render_rect_options *base); +struct fx_render_blur_pass_options { + struct fx_render_texture_options tex_options; + pixman_region32_t *opaque_region; + struct wlr_output *output; + struct wlr_box monitor_box; + struct fx_framebuffer *current_buffer; + struct blur_data *blur_data; + bool use_optimized_blur; + bool ignore_transparent; +}; + /** * Render a fx texture. */ @@ -66,4 +79,23 @@ void fx_render_pass_add_box_shadow(struct fx_gles_render_pass *pass, const struct fx_render_rect_options *fx_options, int corner_radius, struct shadow_data *shadow_data); +/** + * Render blur. + */ +void fx_render_pass_add_blur(struct fx_gles_render_pass *pass, + struct fx_render_blur_pass_options *fx_options); + +/** + * Render optimized blur. + */ +void fx_render_pass_add_optimized_blur(struct fx_gles_render_pass *pass, + struct fx_render_blur_pass_options *fx_options); + +/** + * Render from one buffer to another + */ +void fx_renderer_read_to_buffer(struct fx_gles_render_pass *pass, + pixman_region32_t *region, struct fx_framebuffer *dst_buffer, + struct fx_framebuffer *src_buffer); + #endif -- cgit v1.2.3