diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/render/fx_renderer/fx_renderer.h | 25 | ||||
| -rw-r--r-- | include/render/fx_renderer/shaders.h | 36 | ||||
| -rw-r--r-- | include/render/pass.h | 36 | ||||
| -rw-r--r-- | include/scenefx/types/fx/blur_data.h | 24 | ||||
| -rw-r--r-- | include/scenefx/types/wlr_scene.h | 1 |
5 files changed, 116 insertions, 6 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 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 diff --git a/include/scenefx/types/fx/blur_data.h b/include/scenefx/types/fx/blur_data.h new file mode 100644 index 0000000..e6a7c29 --- /dev/null +++ b/include/scenefx/types/fx/blur_data.h @@ -0,0 +1,24 @@ +#ifndef TYPES_FX_BLUR_DATA_H +#define TYPES_FX_BLUR_DATA_H + +#include <stdbool.h> +#include <wlr/util/addon.h> + +struct blur_data { + int num_passes; + int radius; + float noise; + float brightness; + float contrast; + float saturation; +}; + +struct blur_data blur_data_get_default(void); + +bool blur_data_should_parameters_blur_effects(struct blur_data *blur_data); + +bool blur_data_cmp(struct blur_data *a, struct blur_data *b); + +int blur_data_calc_size(struct blur_data *blur_data); + +#endif diff --git a/include/scenefx/types/wlr_scene.h b/include/scenefx/types/wlr_scene.h index 21558d8..5925931 100644 --- a/include/scenefx/types/wlr_scene.h +++ b/include/scenefx/types/wlr_scene.h @@ -179,6 +179,7 @@ struct wlr_scene_buffer { float opacity; int corner_radius; struct shadow_data shadow_data; + enum wlr_scale_filter_mode filter_mode; struct wlr_fbox src_box; int dst_width, dst_height; |