diff options
| author |  joshualitt <joshualitt@google.com> | 2015-03-31 11:33:08 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-31 11:33:08 -0700 |
| commit | c03391e792a55219ddcb033475dc6b80e6a3e2f9 (patch) | |
| tree | 5671404cac5d89d58cf29fa961d65a357b791149 /src/gpu/GrAADistanceFieldPathRenderer.cpp | |
| parent | eed1dae04932483579b02c10f0706127d3f5d984 (diff) | |
Revert of BitmapTextBatch and BitmapTextBlob (patchset #18 id:360001 of https://codereview.chromium.org/1011403004/)
Reason for revert:
Breaks a unit test on mac
Original issue's description:
> BitmapTextBatch and BitmapTextBlob
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/eed1dae04932483579b02c10f0706127d3f5d984
TBR=fmalita@chromium.org,reed@google.com,jvanverth@google.com,robertphillips@google.com,bsalomon@google.com,jvanverth@chromium.org,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1050633002
Diffstat (limited to 'src/gpu/GrAADistanceFieldPathRenderer.cpp')
| -rwxr-xr-x | src/gpu/GrAADistanceFieldPathRenderer.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gpu/GrAADistanceFieldPathRenderer.cpp b/src/gpu/GrAADistanceFieldPathRenderer.cpp index 789406bdbc..8b119f0b23 100755 --- a/src/gpu/GrAADistanceFieldPathRenderer.cpp +++ b/src/gpu/GrAADistanceFieldPathRenderer.cpp @@ -293,7 +293,8 @@ public: instancesToFlush++; } - this->flush(batchTarget, &drawInfo, instancesToFlush, maxInstancesPerDraw); + this->flush(batchTarget, dfProcessor, pipeline, &drawInfo, instancesToFlush, + maxInstancesPerDraw); } SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; } @@ -420,7 +421,8 @@ private: bool success = atlas->addToAtlas(&id, batchTarget, width, height, dfStorage.get(), &atlasLocation); if (!success) { - this->flush(batchTarget, drawInfo, *instancesToFlush, maxInstancesPerDraw); + this->flush(batchTarget, dfProcessor, pipeline, drawInfo, *instancesToFlush, + maxInstancesPerDraw); this->initDraw(batchTarget, dfProcessor, pipeline); *instancesToFlush = 0; @@ -514,6 +516,8 @@ private: } void flush(GrBatchTarget* batchTarget, + const GrGeometryProcessor* dfProcessor, + const GrPipeline* pipeline, GrDrawTarget::DrawInfo* drawInfo, int instanceCount, int maxInstancesPerDraw) { |