From 1916755b6b3f84329c3e3f3e9a4e1b6d2b4e45a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Mon, 23 Nov 2020 00:43:59 +0100
Subject: [PATCH] Limit border radius to max dimension in `quad` pipeline

---
 glow/src/shader/quad.vert     |   5 +++++
 wgpu/src/shader/quad.vert     |   5 +++++
 wgpu/src/shader/quad.vert.spv | Bin 3372 -> 3604 bytes
 3 files changed, 10 insertions(+)

diff --git a/glow/src/shader/quad.vert b/glow/src/shader/quad.vert
index d37b5c8d..82417856 100644
--- a/glow/src/shader/quad.vert
+++ b/glow/src/shader/quad.vert
@@ -29,6 +29,11 @@ void main() {
     vec2 p_Pos = i_Pos * u_Scale;
     vec2 p_Scale = i_Scale  * u_Scale;
 
+    float i_BorderRadius = min(
+        i_BorderRadius,
+        min(i_Scale.x, i_Scale.y) / 2.0
+    );
+
     mat4 i_Transform = mat4(
         vec4(p_Scale.x + 1.0, 0.0, 0.0, 0.0),
         vec4(0.0, p_Scale.y + 1.0, 0.0, 0.0),
diff --git a/wgpu/src/shader/quad.vert b/wgpu/src/shader/quad.vert
index 1d9a4fd2..09a278b1 100644
--- a/wgpu/src/shader/quad.vert
+++ b/wgpu/src/shader/quad.vert
@@ -24,6 +24,11 @@ void main() {
     vec2 p_Pos = i_Pos * u_Scale;
     vec2 p_Scale = i_Scale  * u_Scale;
 
+    float i_BorderRadius = min(
+        i_BorderRadius,
+        min(i_Scale.x, i_Scale.y) / 2.0
+    );
+
     mat4 i_Transform = mat4(
         vec4(p_Scale.x + 1.0, 0.0, 0.0, 0.0),
         vec4(0.0, p_Scale.y + 1.0, 0.0, 0.0),
diff --git a/wgpu/src/shader/quad.vert.spv b/wgpu/src/shader/quad.vert.spv
index 7059b51bc4575638f541d299aa07e0a12e4f6599..fa71ba1e0a7ad7b811e3d52bb1c7013051410aa8 100644
GIT binary patch
literal 3604
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
ZZ3DE=1#&OQKOjCx-CqVq1`7s81^`CS0)+qo

literal 3372
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