style: unified rounded quad shaders

5 files changed, 20 insertions, 33 deletions

diff --git a/sway/desktop/shaders/meson.build b/sway/desktop/shaders/meson.build
index 14014c7d..6c0dd1d3 100644
--- a/sway/desktop/shaders/meson.build
+++ b/sway/desktop/shaders/meson.build
@@ -6,8 +6,6 @@ shaders = [
     'corner.frag',
     'quad.frag',
     'quad_round.frag',
-    'quad_round_tl.frag',
-    'quad_round_tr.frag',
     'tex.frag',
 ]
 
diff --git a/sway/desktop/shaders/quad_round.frag b/sway/desktop/shaders/quad_round.frag
index ddd6fe9b..4dcf0c53 100644
--- a/sway/desktop/shaders/quad_round.frag
+++ b/sway/desktop/shaders/quad_round.frag
@@ -1,3 +1,11 @@
+#define SOURCE_QUAD_ROUND 1
+#define SOURCE_QUAD_ROUND_TOP_LEFT 2
+#define SOURCE_QUAD_ROUND_TOP_RIGHT 3
+
+#if !defined(SOURCE)
+#error "Missing shader preamble"
+#endif
+
 precision mediump float;
 varying vec4 v_color;
 varying vec2 v_texcoord;
@@ -6,9 +14,19 @@ uniform vec2 size;
 uniform vec2 position;
 uniform float radius;
 
-void main() {
+vec2 getCornerDist() {
+#if SOURCE == SOURCE_QUAD_ROUND
     vec2 half_size = size * 0.5;
-    vec2 q = abs(gl_FragCoord.xy - position - half_size) - half_size + radius;
+    return abs(gl_FragCoord.xy - position - half_size) - half_size + radius;
+#elif SOURCE == SOURCE_QUAD_ROUND_TOP_LEFT
+    return abs(gl_FragCoord.xy - position - size) - size + radius;
+#elif SOURCE == SOURCE_QUAD_ROUND_TOP_RIGHT
+    return abs(gl_FragCoord.xy - position - vec2(0, size.y)) - size + radius;
+#endif
+}
+
+void main() {
+    vec2 q = getCornerDist();
     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);
diff --git a/sway/desktop/shaders/quad_round_tl.frag b/sway/desktop/shaders/quad_round_tl.frag
deleted file mode 100644
index 758fece9..00000000
--- a/sway/desktop/shaders/quad_round_tl.frag
+++ /dev/null
@@ -1,14 +0,0 @@
-precision mediump float;
-varying vec4 v_color;
-varying vec2 v_texcoord;
-
-uniform vec2 size;
-uniform vec2 position;
-uniform float radius;
-
-void main() {
-    vec2 q = abs(gl_FragCoord.xy - position - size) - size + radius;
-    float distance = min(max(q.x,q.y),0.0) + length(max(q,0.0)) - radius;
-    float smoothedAlpha = 1.0 - smoothstep(-1.0, 0.5, distance);
-    gl_FragColor = mix(vec4(0), v_color, smoothedAlpha);
-}
diff --git a/sway/desktop/shaders/quad_round_tr.frag b/sway/desktop/shaders/quad_round_tr.frag
deleted file mode 100644
index 1d8e879f..00000000
--- a/sway/desktop/shaders/quad_round_tr.frag
+++ /dev/null
@@ -1,14 +0,0 @@
-precision mediump float;
-varying vec4 v_color;
-varying vec2 v_texcoord;
-
-uniform vec2 size;
-uniform vec2 position;
-uniform float radius;
-
-void main() {
-    vec2 q = abs(gl_FragCoord.xy - position - vec2(0, size.y)) - size + radius;
-    float distance = min(max(q.x,q.y),0.0) + length(max(q,0.0)) - radius;
-    float smoothedAlpha = 1.0 - smoothstep(-1.0, 0.5, distance);
-    gl_FragColor = mix(vec4(0), v_color, smoothedAlpha);
-}
diff --git a/sway/desktop/shaders/tex.frag b/sway/desktop/shaders/tex.frag
index 51a42c4f..817b838c 100644
--- a/sway/desktop/shaders/tex.frag
+++ b/sway/desktop/shaders/tex.frag
@@ -1,4 +1,3 @@
-/* enum wlr_gles2_shader_source */
 #define SOURCE_TEXTURE_RGBA 1
 #define SOURCE_TEXTURE_RGBX 2
 #define SOURCE_TEXTURE_EXTERNAL 3