From fc2ac12fc05c22a887b271e5497b7a53923df590 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 10 Nov 2017 19:25:47 -0800
Subject: [PATCH] Optimize the XCAA fragment shaders a bit

---
 shaders/gles2/xcaa-curve.fs.glsl | 15 ++++++++-------
 shaders/gles2/xcaa-line.fs.glsl  | 11 +----------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/shaders/gles2/xcaa-curve.fs.glsl b/shaders/gles2/xcaa-curve.fs.glsl
index 235bffae..8ae52ea3 100644
--- a/shaders/gles2/xcaa-curve.fs.glsl
+++ b/shaders/gles2/xcaa-curve.fs.glsl
@@ -19,10 +19,10 @@ varying float vWinding;
 //    x = p0x + t^2 * (p0x - 2*p1x + p2x) + t*(2*p1x - 2*p0x)
 //
 // We use the Citardauq Formula to avoid floating point precision issues.
-float solveCurveT(float p0x, float p1x, float p2x, float x) {
+vec2 solveCurveT(float p0x, float p1x, float p2x, vec2 x) {
     float a = p0x - 2.0 * p1x + p2x;
     float b = 2.0 * p1x - 2.0 * p0x;
-    float c = p0x - x;
+    vec2 c = p0x - x;
     return 2.0 * c / (-b - sqrt(b * b - 4.0 * a * c));
 }
 
@@ -33,17 +33,18 @@ void main() {
     vec2 cp = vControlPoint;
 
     // Compute pixel extents.
-    vec4 pixelExtents = center.xxyy + vec4(-0.5, 0.5, -0.5, 0.5);
+    vec2 pixelExtents = center.xx + vec2(-0.5, 0.5);
 
     // Clip the curve to the left and right edges to create a line.
     //
     // TODO(pcwalton): Consider clipping to the bottom and top edges properly too. (I kind of doubt
     // it's worth it to do this, though, given that the maximum error doing it this way will always
     // be less than a pixel, and it saves a lot of time.)
-    //
-    // FIXME(pcwalton): Factor out shared terms to avoid computing them multiple times.
-    vec2 t = vec2(p0.x < pixelExtents.x ? solveCurveT(p0.x, cp.x, p1.x, pixelExtents.x) : 0.0,
-                  p1.x > pixelExtents.y ? solveCurveT(p0.x, cp.x, p1.x, pixelExtents.y) : 1.0);
+    vec2 t = solveCurveT(p0.x, cp.x, p1.x, pixelExtents);
+    if (p0.x > pixelExtents.x)
+        t.x = 0.0;
+    if (p1.x < pixelExtents.y)
+        t.y = 1.0;
 
     vec2 clippedP0 = mix(mix(p0, cp, t.x), mix(cp, p1, t.x), t.x);
     vec2 clippedP1 = mix(mix(p0, cp, t.y), mix(cp, p1, t.y), t.y);
diff --git a/shaders/gles2/xcaa-line.fs.glsl b/shaders/gles2/xcaa-line.fs.glsl
index e85db212..4355d1f1 100644
--- a/shaders/gles2/xcaa-line.fs.glsl
+++ b/shaders/gles2/xcaa-line.fs.glsl
@@ -18,15 +18,6 @@ void main() {
     vec2 center = gl_FragCoord.xy;
     vec2 p0 = vEndpoints.xy, p1 = vEndpoints.zw;
 
-    // Set up Liang-Barsky clipping.
-    vec4 pixelExtents = center.xxyy + vec4(-0.5, 0.5, -0.5, 0.5);
-    vec2 dp = p1 - p0;
-    vec4 q = pixelExtents - p0.xxyy;
-
-    // Use Liang-Barsky to clip to the left and right sides of this pixel.
-    vec2 t = clamp(q.xy / dp.xx, 0.0, 1.0);
-    vec2 spanP0 = p0 + dp * t.x, spanP1 = p0 + dp * t.y;
-
     // Compute area.
-    gl_FragColor = vec4(computeCoverage(p0, dp, center, vWinding));
+    gl_FragColor = vec4(computeCoverage(p0, p1 - p0, center, vWinding));
 }