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

Unified Diff: src/gpu/GrAADistanceFieldPathRenderer.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/GrAAConvexPathRenderer.cpp ('k') | src/gpu/GrAAHairLinePathRenderer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrAADistanceFieldPathRenderer.cpp
diff --git a/src/gpu/GrAADistanceFieldPathRenderer.cpp b/src/gpu/GrAADistanceFieldPathRenderer.cpp
index b81fcc5c9a4e5f94a2e9ce89d4417418b580a800..e58ba13115962dace9793a3c5dae89ba7707edf7 100755
--- a/src/gpu/GrAADistanceFieldPathRenderer.cpp
+++ b/src/gpu/GrAADistanceFieldPathRenderer.cpp
@@ -167,7 +167,7 @@ public:
int fInstancesToFlush;
};
- void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override {
+ void generateGeometry(GrBatchTarget* batchTarget) override {
int instanceCount = fGeoData.count();
SkMatrix invert;
@@ -191,7 +191,7 @@ public:
flags,
this->usesLocalCoords()));
- batchTarget->initDraw(dfProcessor, pipeline);
+ batchTarget->initDraw(dfProcessor, this->pipeline());
FlushInfo flushInfo;
@@ -244,7 +244,7 @@ public:
args.fPathData = SkNEW(PathData);
if (!this->addPathToAtlas(batchTarget,
dfProcessor,
- pipeline,
+ this->pipeline(),
&flushInfo,
atlas,
args.fPathData,
@@ -266,7 +266,7 @@ public:
SkPoint* positions = reinterpret_cast<SkPoint*>(offset);
this->writePathVertices(batchTarget,
atlas,
- pipeline,
+ this->pipeline(),
dfProcessor,
positions,
vertexStride,
« no previous file with comments | « src/gpu/GrAAConvexPathRenderer.cpp ('k') | src/gpu/GrAAHairLinePathRenderer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698