| Index: src/gpu/GrOvalRenderer.cpp
|
| diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
|
| index c06909d5e1e19383dcb23b01f0b549940175ad13..4575287d05c3de1fe074818a23ffe9c5e34896b2 100644
|
| --- a/src/gpu/GrOvalRenderer.cpp
|
| +++ b/src/gpu/GrOvalRenderer.cpp
|
| @@ -100,10 +100,6 @@
|
| GrGLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder();;
|
| vsBuilder->codeAppendf("%s = %s;", v.vsOut(), circleEffect.inCircleEdge().c_str());
|
|
|
| - // setup position varying
|
| - vsBuilder->codeAppendf("%s = %s * vec3(%s, 1);", vsBuilder->glPosition(),
|
| - vsBuilder->uViewM(), vsBuilder->inPosition());
|
| -
|
| GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder();
|
| fsBuilder->codeAppendf("float d = length(%s.xy);", v.fsIn());
|
| fsBuilder->codeAppendf("float edgeAlpha = clamp(%s.z - d, 0.0, 1.0);", v.fsIn());
|
| @@ -222,10 +218,6 @@
|
| args.fPB->addVarying("EllipseRadii", &ellipseRadii);
|
| vsBuilder->codeAppendf("%s = %s;", ellipseRadii.vsOut(),
|
| ellipseEffect.inEllipseRadii().c_str());
|
| -
|
| - // setup position varying
|
| - vsBuilder->codeAppendf("%s = %s * vec3(%s, 1);", vsBuilder->glPosition(),
|
| - vsBuilder->uViewM(), vsBuilder->inPosition());
|
|
|
| // for outer curve
|
| GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder();
|
| @@ -372,10 +364,6 @@
|
| args.fPB->addVarying("EllipseOffsets1", &offsets1);
|
| vsBuilder->codeAppendf("%s = %s;", offsets1.vsOut(),
|
| ellipseEffect.inEllipseOffsets1().c_str());
|
| -
|
| - // setup position varying
|
| - vsBuilder->codeAppendf("%s = %s * vec3(%s, 1);", vsBuilder->glPosition(),
|
| - vsBuilder->uViewM(), vsBuilder->inPosition());
|
|
|
| GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder();
|
| SkAssertResult(fsBuilder->enableFeature(
|
|
|