| Index: src/gpu/batches/GrAAConvexPathRenderer.cpp
|
| diff --git a/src/gpu/batches/GrAAConvexPathRenderer.cpp b/src/gpu/batches/GrAAConvexPathRenderer.cpp
|
| index a24a0c5945e1fc256521756074e38fb65272c45c..224567acff61b293a19e2d609b4df2d4114f2445 100644
|
| --- a/src/gpu/batches/GrAAConvexPathRenderer.cpp
|
| +++ b/src/gpu/batches/GrAAConvexPathRenderer.cpp
|
| @@ -577,8 +577,7 @@ public:
|
| gpArgs->fPositionVar,
|
| qe.inPosition()->fName,
|
| qe.localMatrix(),
|
| - args.fTransformsIn,
|
| - args.fTransformsOut);
|
| + args.fFPCoordTransformHandler);
|
|
|
| SkAssertResult(fragBuilder->enableFeature(
|
| GrGLSLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));
|
| @@ -614,7 +613,8 @@ public:
|
| }
|
|
|
| void setData(const GrGLSLProgramDataManager& pdman,
|
| - const GrPrimitiveProcessor& gp) override {
|
| + const GrPrimitiveProcessor& gp,
|
| + FPCoordTransformIter&& transformIter) override {
|
| const QuadEdgeEffect& qe = gp.cast<QuadEdgeEffect>();
|
| if (qe.color() != fColor) {
|
| float c[4];
|
| @@ -622,14 +622,7 @@ public:
|
| pdman.set4fv(fColorUniform, 1, c);
|
| fColor = qe.color();
|
| }
|
| - }
|
| -
|
| - void setTransformData(const GrPrimitiveProcessor& primProc,
|
| - const GrGLSLProgramDataManager& pdman,
|
| - int index,
|
| - const SkTArray<const GrCoordTransform*, true>& transforms) override {
|
| - this->setTransformDataHelper(primProc.cast<QuadEdgeEffect>().fLocalMatrix, pdman, index,
|
| - transforms);
|
| + this->setTransformDataHelper(qe.fLocalMatrix, pdman, &transformIter);
|
| }
|
|
|
| private:
|
|
|