diff options
Diffstat (limited to 'src/gpu/text/GrAtlasTextBlob.cpp')
| -rw-r--r-- | src/gpu/text/GrAtlasTextBlob.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/text/GrAtlasTextBlob.cpp b/src/gpu/text/GrAtlasTextBlob.cpp index 601eb372ea..accdf6b693 100644 --- a/src/gpu/text/GrAtlasTextBlob.cpp +++ b/src/gpu/text/GrAtlasTextBlob.cpp @@ -256,7 +256,7 @@ bool GrAtlasTextBlob::mustRegenerate(const GrTextUtils::Paint& paint, return false; } -inline std::unique_ptr<GrDrawOp> GrAtlasTextBlob::makeOp( +inline std::unique_ptr<GrMeshDrawOp> GrAtlasTextBlob::makeOp( const Run::SubRunInfo& info, int glyphCount, int run, int subRun, const SkMatrix& viewMatrix, SkScalar x, SkScalar y, const GrTextUtils::Paint& paint, const SkSurfaceProps& props, const GrDistanceFieldAdjustTable* distanceAdjustTable, @@ -304,12 +304,12 @@ inline void GrAtlasTextBlob::flushRun(GrRenderTargetContext* rtc, const GrClip& continue; } - std::unique_ptr<GrDrawOp> op(this->makeOp(info, glyphCount, run, subRun, viewMatrix, x, y, - paint, props, distanceAdjustTable, - rtc->isGammaCorrect(), cache)); + std::unique_ptr<GrMeshDrawOp> op(this->makeOp(info, glyphCount, run, subRun, viewMatrix, x, + y, paint, props, distanceAdjustTable, + rtc->isGammaCorrect(), cache)); GrPipelineBuilder pipelineBuilder(std::move(grPaint), GrAAType::kNone); - rtc->addDrawOp(pipelineBuilder, clip, std::move(op)); + rtc->addMeshDrawOp(pipelineBuilder, clip, std::move(op)); } } @@ -424,7 +424,7 @@ void GrAtlasTextBlob::flushThrowaway(GrContext* context, GrRenderTargetContext* this->flushBigGlyphs(context, rtc, clip, paint, viewMatrix, x, y, clipBounds); } -std::unique_ptr<GrDrawOp> GrAtlasTextBlob::test_makeOp( +std::unique_ptr<GrMeshDrawOp> GrAtlasTextBlob::test_makeOp( int glyphCount, int run, int subRun, const SkMatrix& viewMatrix, SkScalar x, SkScalar y, const GrTextUtils::Paint& paint, const SkSurfaceProps& props, const GrDistanceFieldAdjustTable* distanceAdjustTable, GrAtlasGlyphCache* cache) { |