| Index: src/gpu/GrAADistanceFieldPathRenderer.cpp
|
| diff --git a/src/gpu/GrAADistanceFieldPathRenderer.cpp b/src/gpu/GrAADistanceFieldPathRenderer.cpp
|
| index b81fcc5c9a4e5f94a2e9ce89d4417418b580a800..e58ba13115962dace9793a3c5dae89ba7707edf7 100755
|
| --- a/src/gpu/GrAADistanceFieldPathRenderer.cpp
|
| +++ b/src/gpu/GrAADistanceFieldPathRenderer.cpp
|
| @@ -167,7 +167,7 @@ public:
|
| int fInstancesToFlush;
|
| };
|
|
|
| - void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override {
|
| + void generateGeometry(GrBatchTarget* batchTarget) override {
|
| int instanceCount = fGeoData.count();
|
|
|
| SkMatrix invert;
|
| @@ -191,7 +191,7 @@ public:
|
| flags,
|
| this->usesLocalCoords()));
|
|
|
| - batchTarget->initDraw(dfProcessor, pipeline);
|
| + batchTarget->initDraw(dfProcessor, this->pipeline());
|
|
|
| FlushInfo flushInfo;
|
|
|
| @@ -244,7 +244,7 @@ public:
|
| args.fPathData = SkNEW(PathData);
|
| if (!this->addPathToAtlas(batchTarget,
|
| dfProcessor,
|
| - pipeline,
|
| + this->pipeline(),
|
| &flushInfo,
|
| atlas,
|
| args.fPathData,
|
| @@ -266,7 +266,7 @@ public:
|
| SkPoint* positions = reinterpret_cast<SkPoint*>(offset);
|
| this->writePathVertices(batchTarget,
|
| atlas,
|
| - pipeline,
|
| + this->pipeline(),
|
| dfProcessor,
|
| positions,
|
| vertexStride,
|
|
|