Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(891)

Unified Diff: src/gpu/GrStrokeRectBatch.cpp

Issue 1275083002: Don't pass pipeline to GrBatch::generateGeometry() (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrStrokeRectBatch.h ('k') | src/gpu/GrTargetCommands.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrStrokeRectBatch.cpp
diff --git a/src/gpu/GrStrokeRectBatch.cpp b/src/gpu/GrStrokeRectBatch.cpp
index 4754e68b30c6ec32d5f09bb7f4caaccaf9ab27f5..c850fb7d9ae9f61bbec331ef6c1dee547796b3e3 100644
--- a/src/gpu/GrStrokeRectBatch.cpp
+++ b/src/gpu/GrStrokeRectBatch.cpp
@@ -66,7 +66,7 @@ static void init_stroke_rect_strip(SkPoint verts[10], const SkRect& rect, SkScal
}
-void GrStrokeRectBatch::generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) {
+void GrStrokeRectBatch::generateGeometry(GrBatchTarget* batchTarget) {
SkAutoTUnref<const GrGeometryProcessor> gp;
{
using namespace GrDefaultGeoProcFactory;
@@ -79,7 +79,7 @@ void GrStrokeRectBatch::generateGeometry(GrBatchTarget* batchTarget, const GrPip
this->viewMatrix()));
}
- batchTarget->initDraw(gp, pipeline);
+ batchTarget->initDraw(gp, this->pipeline());
size_t vertexStride = gp->getVertexStride();
« no previous file with comments | « src/gpu/GrStrokeRectBatch.h ('k') | src/gpu/GrTargetCommands.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698