commit fb1141ae1db2ffce479bc46413b008d31cf9d3cc
author bsalomon <bsalomon@google.com> Thu Aug 06 08:52:49 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Aug 06 08:52:49 2015 -0700
tree 3a1773afbc059d9afa5366a52e4def825e586ead
parent c8da81df6b7502bfd57eb34627efbc7cdda2afeb

Don't pass pipeline to GrBatch::generateGeometry()

R=joshualitt@google.com

Review URL: https://codereview.chromium.org/1275083002

src/gpu/GrAtlasTextContext.cpp

diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp
index 6f8d119..c8c5760 100644
--- a/src/gpu/GrAtlasTextContext.cpp
+++ b/src/gpu/GrAtlasTextContext.cpp
@@ -1535,7 +1535,7 @@
         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 @@
                                   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 @@
                             !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,