diff --git a/demo/client/src/index.ts b/demo/client/src/index.ts index 18931413..0269ec91 100644 --- a/demo/client/src/index.ts +++ b/demo/client/src/index.ts @@ -1255,17 +1255,12 @@ class ECAAStrategy implements AntialiasingStrategy { this.detectEdges(view); // Conservatively cover. - //if (view.timerQueryPollInterval == null) - // view.timerQueryExt.beginQueryEXT(view.timerQueryExt.TIME_ELAPSED_EXT, view.timerQuery); this.cover(view); // Antialias. this.antialiasLines(view); this.antialiasCurves(view); - //if (view.timerQueryPollInterval == null) - // view.timerQueryExt.endQueryEXT(view.timerQueryExt.TIME_ELAPSED_EXT); - // Resolve the antialiasing. this.resolveAA(view); } diff --git a/shaders/gles2/ecaa-cover.fs.glsl b/shaders/gles2/ecaa-cover.fs.glsl index 6bbafe7a..edcbfaef 100644 --- a/shaders/gles2/ecaa-cover.fs.glsl +++ b/shaders/gles2/ecaa-cover.fs.glsl @@ -9,5 +9,5 @@ varying vec2 vHorizontalExtents; void main() { vec2 sides = gl_FragCoord.xx + vec2(-0.5, 0.5); vec2 clampedSides = clamp(vHorizontalExtents, sides.x, sides.y); - gl_FragColor = vec4(clampedSides.y - clampedSides.x); + gl_FragColor = vec4(vec3(clampedSides.y - clampedSides.x), 1.0); } diff --git a/shaders/gles2/ecaa-curve.fs.glsl b/shaders/gles2/ecaa-curve.fs.glsl index 861c7fc4..98e30144 100644 --- a/shaders/gles2/ecaa-curve.fs.glsl +++ b/shaders/gles2/ecaa-curve.fs.glsl @@ -38,8 +38,8 @@ void main() { // 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(pixelExtents.x > p0.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 = 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 spanP0 = mix(mix(p0, cp, t.x), mix(cp, p1, t.x), t.x); vec2 spanP1 = mix(mix(p0, cp, t.y), mix(cp, p1, t.y), t.y);