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

fixed rebase

Browse source
This commit is contained in:
Will McKinnon 2023-01-01 18:36:52 -05:00
parent 5c1d0b1c91
commit c2dee0740d
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sway/desktop/fx_renderer.c
View file

@ -625,8 +625,7 @@ void fx_render_box_shadow(struct fx_renderer *renderer, const struct wlr_box *bo
glUseProgram(renderer->shaders.box_shadow.program); glUseProgram(renderer->shaders.box_shadow.program);
glUniformMatrix3fv(renderer->shaders.box_shadow.proj, 1, GL_FALSE, gl_matrix); glUniformMatrix3fv(renderer->shaders.box_shadow.proj, 1, GL_FALSE, gl_matrix);
glUniform3f(renderer->shaders.box_shadow.color, color[0], color[1], color[2]); glUniform4f(renderer->shaders.box_shadow.color, color[0], color[1], color[2], color[3]);
glUniform1f(renderer->shaders.box_shadow.alpha, color[3]);
glUniform1f(renderer->shaders.box_shadow.blur_sigma, blur_sigma); glUniform1f(renderer->shaders.box_shadow.blur_sigma, blur_sigma);
glUniform1f(renderer->shaders.box_shadow.corner_radius, corner_radius); glUniform1f(renderer->shaders.box_shadow.corner_radius, corner_radius);

5
sway/desktop/shaders/box_shadow.frag
View file

@ -1,9 +1,9 @@
// Writeup: https://madebyevan.com/shaders/fast-rounded-rectangle-shadows/ // Writeup: https://madebyevan.com/shaders/fast-rounded-rectangle-shadows/
precision mediump float; precision mediump float;
varying vec4 v_color;
varying vec2 v_texcoord; varying vec2 v_texcoord;
uniform vec3 color;
uniform vec2 position; uniform vec2 position;
uniform vec2 size; uniform vec2 size;
uniform float blur_sigma; uniform float blur_sigma;
@ -70,6 +70,5 @@ void main() {
// dither the alpha to break up color bands // dither the alpha to break up color bands
frag_alpha += (random() - 0.5) / 128.0; frag_alpha += (random() - 0.5) / 128.0;
gl_FragColor = vec4(color, frag_alpha); gl_FragColor = vec4(v_color.rgb, frag_alpha);
} }