| Index: src/gpu/GrAtlasTextContext.cpp
|
| diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp
|
| index 6f8d1196368ca992242abcb993b15ba4003ee3df..c8c57601067b8dcfd3488b5e8f9977ac6b171928 100644
|
| --- a/src/gpu/GrAtlasTextContext.cpp
|
| +++ b/src/gpu/GrAtlasTextContext.cpp
|
| @@ -1535,7 +1535,7 @@ public:
|
| int fVertexOffset;
|
| };
|
|
|
| - void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override {
|
| + void generateGeometry(GrBatchTarget* batchTarget) override {
|
| // if we have RGB, then we won't have any SkShaders so no need to use a localmatrix.
|
| // TODO actually only invert if we don't have RGBA
|
| SkMatrix localMatrix;
|
| @@ -1575,7 +1575,7 @@ public:
|
| get_vertex_stride_df(maskFormat, isLCD) :
|
| get_vertex_stride(maskFormat)));
|
|
|
| - batchTarget->initDraw(gp, pipeline);
|
| + batchTarget->initDraw(gp, this->pipeline());
|
|
|
| int glyphCount = this->numGlyphs();
|
| const GrVertexBuffer* vertexBuffer;
|
| @@ -1692,7 +1692,7 @@ public:
|
| !strike->addGlyphToAtlas(batchTarget, glyph, scaler, skGlyph,
|
| maskFormat)) {
|
| this->flush(batchTarget, &flushInfo);
|
| - batchTarget->initDraw(gp, pipeline);
|
| + batchTarget->initDraw(gp, this->pipeline());
|
| brokenRun = glyphIdx > 0;
|
|
|
| SkDEBUGCODE(bool success =) strike->addGlyphToAtlas(batchTarget,
|
|
|