| Index: src/gpu/batches/GrMSAAPathRenderer.cpp
|
| diff --git a/src/gpu/batches/GrMSAAPathRenderer.cpp b/src/gpu/batches/GrMSAAPathRenderer.cpp
|
| index 19dd3663e5ab8cb7a22e86ff1d62da3cbb25c081..d6b5578d8a21d5013ed2adcd5a32894ee13b3302 100644
|
| --- a/src/gpu/batches/GrMSAAPathRenderer.cpp
|
| +++ b/src/gpu/batches/GrMSAAPathRenderer.cpp
|
| @@ -148,8 +148,8 @@
|
|
|
| // emit transforms
|
| this->emitTransforms(vsBuilder, varyingHandler, uniformHandler, gpArgs->fPositionVar,
|
| - qp.inPosition()->fName, SkMatrix::I(),
|
| - args.fFPCoordTransformHandler);
|
| + qp.inPosition()->fName, SkMatrix::I(), args.fTransformsIn,
|
| + args.fTransformsOut);
|
|
|
| GrGLSLPPFragmentBuilder* fsBuilder = args.fFragBuilder;
|
| fsBuilder->codeAppendf("if (%s.x * %s.x >= %s.y) discard;", uv.fsIn(), uv.fsIn(),
|
| @@ -167,15 +167,14 @@
|
| b->add32(key);
|
| }
|
|
|
| - void setData(const GrGLSLProgramDataManager& pdman, const GrPrimitiveProcessor& gp,
|
| - FPCoordTransformIter&& transformIter) override {
|
| + virtual void setData(const GrGLSLProgramDataManager& pdman,
|
| + const GrPrimitiveProcessor& gp) override {
|
| const MSAAQuadProcessor& qp = gp.cast<MSAAQuadProcessor>();
|
| if (!qp.viewMatrix().isIdentity()) {
|
| float viewMatrix[3 * 3];
|
| GrGLSLGetMatrix<3>(viewMatrix, qp.viewMatrix());
|
| pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);
|
| }
|
| - this->setTransformDataHelper(SkMatrix::I(), pdman, &transformIter);
|
| }
|
|
|
| private:
|
|
|