| Index: src/gpu/effects/GrBitmapTextGeoProc.cpp
|
| diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp
|
| index 20a4e937c084a153efe1c6f43c0028570378fe54..7f5366363f9d568bb56206adf2aeeffbb60eb5cc 100644
|
| --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp
|
| +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp
|
| @@ -60,8 +60,7 @@ public:
|
| gpArgs->fPositionVar,
|
| cte.inPosition()->fName,
|
| cte.localMatrix(),
|
| - args.fTransformsIn,
|
| - args.fTransformsOut);
|
| + args.fFPCoordTransformHandler);
|
|
|
| if (cte.maskFormat() == kARGB_GrMaskFormat) {
|
| fragBuilder->codeAppendf("%s = ", args.fOutputColor);
|
| @@ -84,7 +83,8 @@ public:
|
| }
|
| }
|
|
|
| - void setData(const GrGLSLProgramDataManager& pdman, const GrPrimitiveProcessor& gp) override {
|
| + void setData(const GrGLSLProgramDataManager& pdman, const GrPrimitiveProcessor& gp,
|
| + FPCoordTransformIter&& transformIter) override {
|
| const GrBitmapTextGeoProc& btgp = gp.cast<GrBitmapTextGeoProc>();
|
| if (btgp.color() != fColor && !btgp.hasVertexColor()) {
|
| float c[4];
|
| @@ -92,14 +92,7 @@ public:
|
| pdman.set4fv(fColorUniform, 1, c);
|
| fColor = btgp.color();
|
| }
|
| - }
|
| -
|
| - void setTransformData(const GrPrimitiveProcessor& primProc,
|
| - const GrGLSLProgramDataManager& pdman,
|
| - int index,
|
| - const SkTArray<const GrCoordTransform*, true>& transforms) override {
|
| - this->setTransformDataHelper(primProc.cast<GrBitmapTextGeoProc>().localMatrix(), pdman,
|
| - index, transforms);
|
| + this->setTransformDataHelper(btgp.localMatrix(), pdman, &transformIter);
|
| }
|
|
|
| static inline void GenKey(const GrGeometryProcessor& proc,
|
|
|