From 42f9949981443edfdba3a7884f848bc75b139162 Mon Sep 17 00:00:00 2001 From: Will McKinnon Date: Tue, 17 Jan 2023 01:58:28 -0500 Subject: [PATCH] cleanup old stencil impl --- sway/desktop/render.c | 2 -- sway/desktop/shaders/corner.frag | 5 ----- sway/desktop/shaders/quad.frag | 4 ---- sway/desktop/shaders/quad_round_tl.frag | 4 ---- sway/desktop/shaders/quad_round_tr.frag | 4 ---- sway/desktop/shaders/tex_external.frag | 4 ---- sway/desktop/shaders/tex_rgba.frag | 4 ---- sway/desktop/shaders/tex_rgbx.frag | 4 ---- 8 files changed, 31 deletions(-) diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 075b1922..36be155e 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -1015,7 +1015,6 @@ static void render_containers_linear(struct sway_output *output, .saturation = child->saturation, .has_titlebar = has_titlebar, }; - render_view(output, damage, child, colors, deco_data); if (has_titlebar) { render_titlebar(output, damage, child, floor(state->x), floor(state->y), @@ -1024,7 +1023,6 @@ static void render_containers_linear(struct sway_output *output, } else if (state->border == B_PIXEL) { render_top_border(output, damage, state, colors, deco_data.alpha, deco_data.corner_radius); } - } else { render_container(output, damage, child, parent->focused || child->current.focused); diff --git a/sway/desktop/shaders/corner.frag b/sway/desktop/shaders/corner.frag index 10810971..25920b77 100644 --- a/sway/desktop/shaders/corner.frag +++ b/sway/desktop/shaders/corner.frag @@ -24,11 +24,6 @@ void main() { float smoothedAlphaInner = 1.0 - smoothstep(-1.0, 0.5, dist + half_thickness); gl_FragColor = mix(vec4(0), v_color, smoothedAlphaOuter - smoothedAlphaInner); - if (gl_FragColor.a == 0.0) { - discard; - return; - } - if (is_top_left && (center.y > 0.0 || center.x > 0.0)) { discard; } else if (is_top_right && (center.y > 0.0 || center.x < 0.0)) { diff --git a/sway/desktop/shaders/quad.frag b/sway/desktop/shaders/quad.frag index 3b2afd65..7c763272 100644 --- a/sway/desktop/shaders/quad.frag +++ b/sway/desktop/shaders/quad.frag @@ -4,8 +4,4 @@ varying vec2 v_texcoord; void main() { gl_FragColor = v_color; - - if (gl_FragColor.a == 0.0) { - discard; - } } diff --git a/sway/desktop/shaders/quad_round_tl.frag b/sway/desktop/shaders/quad_round_tl.frag index 77379418..8f10cce6 100644 --- a/sway/desktop/shaders/quad_round_tl.frag +++ b/sway/desktop/shaders/quad_round_tl.frag @@ -11,8 +11,4 @@ void main() { float dist = min(max(q.x,q.y), 0.0) + length(max(q, 0.0)) - radius; float smoothedAlpha = 1.0 - smoothstep(-1.0, 0.5, dist); gl_FragColor = mix(vec4(0), v_color, smoothedAlpha); - - if (gl_FragColor.a == 0.0) { - discard; - } } diff --git a/sway/desktop/shaders/quad_round_tr.frag b/sway/desktop/shaders/quad_round_tr.frag index b4daac01..385cb331 100644 --- a/sway/desktop/shaders/quad_round_tr.frag +++ b/sway/desktop/shaders/quad_round_tr.frag @@ -11,8 +11,4 @@ void main() { float dist = min(max(q.x,q.y), 0.0) + length(max(q, 0.0)) - radius; float smoothedAlpha = 1.0 - smoothstep(-1.0, 0.5, dist); gl_FragColor = mix(vec4(0), v_color, smoothedAlpha); - - if (gl_FragColor.a == 0.0) { - discard; - } } diff --git a/sway/desktop/shaders/tex_external.frag b/sway/desktop/shaders/tex_external.frag index 502ed2a0..adcbc7bb 100644 --- a/sway/desktop/shaders/tex_external.frag +++ b/sway/desktop/shaders/tex_external.frag @@ -34,8 +34,4 @@ void main() { gl_FragColor = mix(vec4(0), gl_FragColor, smooth); } } - - if (gl_FragColor.a == 0.0) { - discard; - } } diff --git a/sway/desktop/shaders/tex_rgba.frag b/sway/desktop/shaders/tex_rgba.frag index 441b920f..65b46bc6 100644 --- a/sway/desktop/shaders/tex_rgba.frag +++ b/sway/desktop/shaders/tex_rgba.frag @@ -32,8 +32,4 @@ void main() { gl_FragColor = mix(vec4(0), gl_FragColor, smooth); } } - - if (gl_FragColor.a == 0.0) { - discard; - } } diff --git a/sway/desktop/shaders/tex_rgbx.frag b/sway/desktop/shaders/tex_rgbx.frag index 599fc7f5..7fa68ca4 100644 --- a/sway/desktop/shaders/tex_rgbx.frag +++ b/sway/desktop/shaders/tex_rgbx.frag @@ -31,8 +31,4 @@ void main() { gl_FragColor = mix(vec4(0), gl_FragColor, smooth); } } - - if (gl_FragColor.a == 0.0) { - discard; - } }