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

moved fx_framebuffer binds to fx_renderer

Browse source
This commit is contained in:
William McKinnon 2023-07-26 00:18:00 -04:00
parent da8c83d803
commit 51fde22616
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sway/desktop/fx_renderer/fx_renderer.c
View file

@ -849,9 +849,8 @@ void fx_render_blur_pass(struct fx_renderer *renderer, const float matrix[static
glDisableVertexAttribArray(shader->tex_attrib); glDisableVertexAttribArray(shader->tex_attrib);
} }
void fx_render_blur_segments(struct fx_renderer *renderer, void fx_render_blur_segments(struct fx_renderer *renderer, const float matrix[static 9],
const float matrix[static 9], pixman_region32_t *damage, pixman_region32_t *damage, struct fx_framebuffer **buffer, struct blur_shader* shader,
struct fx_framebuffer **buffer, struct blur_shader* shader,
const struct wlr_box *box, int blur_radius) { const struct wlr_box *box, int blur_radius) {
if (*buffer == &renderer->effects_buffer) { if (*buffer == &renderer->effects_buffer) {
fx_framebuffer_bind(&renderer->effects_buffer_swapped); fx_framebuffer_bind(&renderer->effects_buffer_swapped);
@ -877,7 +876,13 @@ void fx_render_blur_segments(struct fx_renderer *renderer,
} }
} }
void fx_render_main_buffer_blur(struct fx_renderer *renderer, const float gl_matrix[static 9], pixman_region32_t *damage, const struct wlr_box *dst_box, struct fx_framebuffer **current_buffer, int blur_radius, int blur_passes) { void fx_render_main_buffer_blur(struct fx_renderer *renderer, const float gl_matrix[static 9],
pixman_region32_t *damage, const struct wlr_box *dst_box,
struct fx_framebuffer **current_buffer, int blur_radius, int blur_passes) {
// Bind to blur framebuffer
fx_framebuffer_bind(&renderer->effects_buffer);
glBindTexture(renderer->main_buffer.texture.target, renderer->main_buffer.texture.id);
// damage region will be scaled, make a temp // damage region will be scaled, make a temp
pixman_region32_t tempDamage; pixman_region32_t tempDamage;
pixman_region32_init(&tempDamage); pixman_region32_init(&tempDamage);
@ -898,4 +903,7 @@ void fx_render_main_buffer_blur(struct fx_renderer *renderer, const float gl_mat
} }
pixman_region32_fini(&tempDamage); pixman_region32_fini(&tempDamage);
// Bind back to the default buffer
fx_framebuffer_bind(&renderer->main_buffer);
} }

8
sway/desktop/render.c
View file

@ -202,20 +202,12 @@ struct fx_framebuffer *render_main_buffer_blur(struct sway_output *output,
// Initially blur main_buffer content into the effects_buffers // Initially blur main_buffer content into the effects_buffers
struct fx_framebuffer *current_buffer = &renderer->main_buffer; struct fx_framebuffer *current_buffer = &renderer->main_buffer;
// Bind to blur framebuffer
fx_framebuffer_bind(&renderer->effects_buffer);
glBindTexture(renderer->main_buffer.texture.target, renderer->main_buffer.texture.id);
int blur_radius = config->blur_params.radius; int blur_radius = config->blur_params.radius;
int blur_passes = config->blur_params.num_passes; int blur_passes = config->blur_params.num_passes;
fx_render_main_buffer_blur(renderer, gl_matrix, &damage, dst_box, &current_buffer, blur_radius, blur_passes); fx_render_main_buffer_blur(renderer, gl_matrix, &damage, dst_box, &current_buffer, blur_radius, blur_passes);
pixman_region32_fini(&damage); pixman_region32_fini(&damage);
// Bind back to the default buffer
fx_framebuffer_bind(&renderer->main_buffer);
return current_buffer; return current_buffer;
} }