diff options
author | Erik Reider <[email protected]> | 2024-02-27 18:05:58 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2024-02-27 18:05:58 +0100 |
commit | 7f0883b383b73af7bc68dcf8c2ee845c5eab5807 (patch) | |
tree | ff13a416200ac372d0ae303e5996bb9a22f819dd /include/render/fx_renderer | |
parent | 5b6862c981eb5541888f625cd93e7775cabe06b0 (diff) |
[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
Diffstat (limited to 'include/render/fx_renderer')
-rw-r--r-- | include/render/fx_renderer/fx_renderer.h | 25 | ||||
-rw-r--r-- | include/render/fx_renderer/shaders.h | 36 |
2 files changed, 57 insertions, 4 deletions
diff --git a/include/render/fx_renderer/fx_renderer.h b/include/render/fx_renderer/fx_renderer.h index 4a95634..83ac305 100644 --- a/include/render/fx_renderer/fx_renderer.h +++ b/include/render/fx_renderer/fx_renderer.h @@ -13,7 +13,6 @@ #include "render/fx_renderer/shaders.h" #include "render/pass.h" -#include "scenefx/types/fx/shadow_data.h" struct fx_pixel_format { uint32_t drm_format; @@ -48,13 +47,15 @@ struct fx_framebuffer { struct wlr_addon addon; }; +/** Should only be used with custom fbs */ +void fx_framebuffer_get_or_create_custom(struct fx_renderer *fx_renderer, + struct wlr_output *output, struct fx_framebuffer **fx_buffer); + struct fx_framebuffer *fx_framebuffer_get_or_create(struct fx_renderer *renderer, struct wlr_buffer *wlr_buffer); void fx_framebuffer_bind(struct fx_framebuffer *buffer); -void fx_framebuffer_bind_wlr_fbo(struct fx_renderer *renderer); - void fx_framebuffer_destroy(struct fx_framebuffer *buffer); /// @@ -148,6 +149,9 @@ struct fx_renderer { struct tex_shader tex_ext; struct box_shadow_shader box_shadow; struct stencil_mask_shader stencil_mask; + struct blur_shader blur1; + struct blur_shader blur2; + struct blur_effects_shader blur_effects; } shaders; struct wl_list buffers; // fx_framebuffer.link @@ -155,6 +159,21 @@ struct fx_renderer { struct fx_framebuffer *current_buffer; uint32_t viewport_width, viewport_height; + + // Contains the blurred background for tiled windows + struct fx_framebuffer *optimized_blur_buffer; + // Contains the original pixels to draw over the areas where artifact are visible + struct fx_framebuffer *blur_saved_pixels_buffer; + // Blur swaps between the two effects buffers everytime it scales the image + // Buffer used for effects + struct fx_framebuffer *effects_buffer; + // Swap buffer used for effects + struct fx_framebuffer *effects_buffer_swapped; + + // The region where there's blur + pixman_region32_t blur_padding_region; + + bool blur_buffer_dirty; }; bool wlr_renderer_is_fx(struct wlr_renderer *wlr_renderer); diff --git a/include/render/fx_renderer/shaders.h b/include/render/fx_renderer/shaders.h index 92a14d5..226dd36 100644 --- a/include/render/fx_renderer/shaders.h +++ b/include/render/fx_renderer/shaders.h @@ -27,6 +27,8 @@ struct quad_shader { GLint pos_attrib; }; +bool link_quad_program(struct quad_shader *shader); + struct tex_shader { GLuint program; GLint proj; @@ -37,8 +39,11 @@ struct tex_shader { GLint size; GLint position; GLint radius; + GLint discard_transparent; }; +bool link_tex_program(struct tex_shader *shader, enum fx_tex_shader_source source); + struct stencil_mask_shader { GLuint program; GLint proj; @@ -49,6 +54,8 @@ struct stencil_mask_shader { GLint radius; }; +bool link_stencil_mask_program(struct stencil_mask_shader *shader); + struct box_shadow_shader { GLuint program; GLint proj; @@ -60,6 +67,33 @@ struct box_shadow_shader { GLint corner_radius; }; -bool link_shaders(struct fx_renderer *renderer); +bool link_box_shadow_program(struct box_shadow_shader *shader); + +struct blur_shader { + GLuint program; + GLint proj; + GLint tex_proj; + GLint tex; + GLint pos_attrib; + GLint radius; + GLint halfpixel; +}; + +bool link_blur1_program(struct blur_shader *shader); +bool link_blur2_program(struct blur_shader *shader); + +struct blur_effects_shader { + GLuint program; + GLint proj; + GLint tex_proj; + GLint tex; + GLint pos_attrib; + GLfloat noise; + GLfloat brightness; + GLfloat contrast; + GLfloat saturation; +}; + +bool link_blur_effects_program(struct blur_effects_shader *shader); #endif |