| Index: src/gpu/GrAALinearizingConvexPathRenderer.cpp
|
| diff --git a/src/gpu/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/GrAALinearizingConvexPathRenderer.cpp
|
| index e4b592af3c9b5f143d1b56a216fe89d88886bf8c..da90fe0d61cc9e7817f3bc7ae2013ef605a4cf86 100644
|
| --- a/src/gpu/GrAALinearizingConvexPathRenderer.cpp
|
| +++ b/src/gpu/GrAALinearizingConvexPathRenderer.cpp
|
| @@ -184,7 +184,7 @@ public:
|
| batchTarget->draw(info);
|
| }
|
|
|
| - void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override {
|
| + void generateGeometry(GrBatchTarget* batchTarget) override {
|
| bool canTweakAlphaForCoverage = this->canTweakAlphaForCoverage();
|
|
|
| // Setup GrGeometryProcessor
|
| @@ -197,7 +197,7 @@ public:
|
| return;
|
| }
|
|
|
| - batchTarget->initDraw(gp, pipeline);
|
| + batchTarget->initDraw(gp, this->pipeline());
|
|
|
| size_t vertexStride = gp->getVertexStride();
|
|
|
| @@ -226,7 +226,7 @@ public:
|
| if (indexCount + currentIndices > UINT16_MAX) {
|
| // if we added the current instance, we would overflow the indices we can store in a
|
| // uint16_t. Draw what we've got so far and reset.
|
| - draw(batchTarget, pipeline, vertexCount, vertexStride, vertices, indexCount,
|
| + draw(batchTarget, this->pipeline(), vertexCount, vertexStride, vertices, indexCount,
|
| indices);
|
| vertexCount = 0;
|
| indexCount = 0;
|
| @@ -246,7 +246,8 @@ public:
|
| vertexCount += currentVertices;
|
| indexCount += currentIndices;
|
| }
|
| - draw(batchTarget, pipeline, vertexCount, vertexStride, vertices, indexCount, indices);
|
| + draw(batchTarget, this->pipeline(), vertexCount, vertexStride, vertices, indexCount,
|
| + indices);
|
| free(vertices);
|
| free(indices);
|
| }
|
|
|