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

Unified Diff: src/gpu/GrAADistanceFieldPathRenderer.cpp

Issue 1139723004: Preliminary attempt to remove batch tracker (Closed) Base URL: https://skia.googlesource.com/skia.git@cleanup5
Patch Set: tweaks Created 5 years, 7 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 c1bd885a5bbb823d4f33afef1467bdd2856279ec..31d9cc43a8393fea5ec0ab399125498b5d81abe3 100755
--- a/src/gpu/GrAADistanceFieldPathRenderer.cpp
+++ b/src/gpu/GrAADistanceFieldPathRenderer.cpp
@@ -197,9 +197,10 @@ public:
this->viewMatrix(),
atlas->getTexture(),
params,
- flags));
+ flags,
+ this->usesLocalCoords()));
- this->initDraw(batchTarget, dfProcessor, pipeline);
+ batchTarget->initDraw(dfProcessor, pipeline);
FlushInfo flushInfo;
@@ -414,7 +415,7 @@ private:
&atlasLocation);
if (!success) {
this->flush(batchTarget, flushInfo);
- this->initDraw(batchTarget, dfProcessor, pipeline);
+ batchTarget->initDraw(dfProcessor, pipeline);
SkDEBUGCODE(success =) atlas->addToAtlas(&id, batchTarget, width, height,
dfStorage.get(), &atlasLocation);
@@ -491,20 +492,6 @@ private:
vertexStride);
}
- void initDraw(GrBatchTarget* batchTarget,
- const GrGeometryProcessor* dfProcessor,
- const GrPipeline* pipeline) {
- batchTarget->initDraw(dfProcessor, pipeline);
-
- // TODO remove this when batch is everywhere
- GrPipelineInfo init;
- init.fColorIgnored = fBatch.fColorIgnored;
- init.fOverrideColor = GrColor_ILLEGAL;
- init.fCoverageIgnored = fBatch.fCoverageIgnored;
- init.fUsesLocalCoords = this->usesLocalCoords();
- dfProcessor->initBatchTracker(batchTarget->currentBatchTracker(), init);
- }
-
void flush(GrBatchTarget* batchTarget, FlushInfo* flushInfo) {
GrVertices vertices;
int maxInstancesPerDraw = flushInfo->fIndexBuffer->maxQuads();
« 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