diff options
author | joshualitt <joshualitt@chromium.org> | 2015-03-31 13:32:05 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-31 13:32:05 -0700 |
commit | 7c3a2f834e0ba3f11a3129d5348b393efcc9b0e1 (patch) | |
tree | c3db9be6811f50b7f43320253779ff8c3aaaba69 /src/gpu/GrAADistanceFieldPathRenderer.cpp | |
parent | 7b6db098051c52c0454c0f00445353c6fc33f810 (diff) |
BitmapTextBatch and BitmapTextBlob
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/eed1dae04932483579b02c10f0706127d3f5d984
Review URL: https://codereview.chromium.org/1011403004
Diffstat (limited to 'src/gpu/GrAADistanceFieldPathRenderer.cpp')
-rwxr-xr-x | src/gpu/GrAADistanceFieldPathRenderer.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gpu/GrAADistanceFieldPathRenderer.cpp b/src/gpu/GrAADistanceFieldPathRenderer.cpp index 8b119f0b23..789406bdbc 100755 --- a/src/gpu/GrAADistanceFieldPathRenderer.cpp +++ b/src/gpu/GrAADistanceFieldPathRenderer.cpp @@ -293,8 +293,7 @@ public: instancesToFlush++; } - this->flush(batchTarget, dfProcessor, pipeline, &drawInfo, instancesToFlush, - maxInstancesPerDraw); + this->flush(batchTarget, &drawInfo, instancesToFlush, maxInstancesPerDraw); } SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; } @@ -421,8 +420,7 @@ private: bool success = atlas->addToAtlas(&id, batchTarget, width, height, dfStorage.get(), &atlasLocation); if (!success) { - this->flush(batchTarget, dfProcessor, pipeline, drawInfo, *instancesToFlush, - maxInstancesPerDraw); + this->flush(batchTarget, drawInfo, *instancesToFlush, maxInstancesPerDraw); this->initDraw(batchTarget, dfProcessor, pipeline); *instancesToFlush = 0; @@ -516,8 +514,6 @@ private: } void flush(GrBatchTarget* batchTarget, - const GrGeometryProcessor* dfProcessor, - const GrPipeline* pipeline, GrDrawTarget::DrawInfo* drawInfo, int instanceCount, int maxInstancesPerDraw) { |