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/GrAALinearizingConvexPathRenderer.cpp

diff --git a/src/gpu/GrAALinearizingConvexPathRenderer.cpp b/src/gpu/GrAALinearizingConvexPathRenderer.cpp
index e4b592a..da90fe0 100644
--- a/src/gpu/GrAALinearizingConvexPathRenderer.cpp
+++ b/src/gpu/GrAALinearizingConvexPathRenderer.cpp
@@ -184,7 +184,7 @@
         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 @@
             return;
         }
 
-        batchTarget->initDraw(gp, pipeline);
+        batchTarget->initDraw(gp, this->pipeline());
 
         size_t vertexStride = gp->getVertexStride();
 
@@ -226,7 +226,7 @@
             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 @@
             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);
     }