michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix regression involving NaN when doing curve clipping

This commit is contained in:
Patrick Walton 2017-11-11 09:38:06 -08:00
parent 37cdc9bc5c
commit 575d4c2366
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shaders/gles2/xcaa-curve.fs.glsl
View File

@ -29,9 +29,11 @@ void main() {
// 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.)
vec2 t = solveCurveT(p0.x, cp.x, p1.x, pixelExtents);
if (p0.x > pixelExtents.x)
// Handle endpoints properly. These tests are negated to handle NaNs.
if (!(p0.x < pixelExtents.x))
t.x = 0.0;
if (p1.x < pixelExtents.y)
if (!(p1.x > pixelExtents.y))
t.y = 1.0;
vec2 clippedP0 = mix(mix(p0, cp, t.x), mix(cp, p1, t.x), t.x);

6
shaders/gles2/xcaa-multi-edge-mask-curve.fs.glsl
View File

@ -29,9 +29,11 @@ void main() {
// 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.)
vec2 t = solveCurveT(p0.x, cp.x, p1.x, pixelExtents);
if (p0.x > pixelExtents.x)
// Handle endpoints properly. These tests are negated to handle NaNs.
if (!(p0.x < pixelExtents.x))
t.x = 0.0;
if (p1.x < pixelExtents.y)
if (!(p1.x > pixelExtents.y))
t.y = 1.0;
vec2 clippedP0 = mix(mix(p0, cp, t.x), mix(cp, p1, t.x), t.x);