diff options
author | Robert Phillips <robertphillips@google.com> | 2018-01-18 12:59:22 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-18 18:31:58 +0000 |
commit | 40a29d7705d970be03ff94f9fa062db75dccbd0f (patch) | |
tree | 67908df5424d112ea27a012de435819586f23793 /src/atlastext | |
parent | 3af7f6e2ce32c0909159145b23378d119e900bbe (diff) |
Move GrOpFlushState out of GrDrawingManager and onto the stack
Change-Id: If1b3481af7637bfed8a73d75be41c6422319951f
Reviewed-on: https://skia-review.googlesource.com/96540
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/atlastext')
-rw-r--r-- | src/atlastext/SkInternalAtlasTextContext.cpp | 9 | ||||
-rw-r--r-- | src/atlastext/SkInternalAtlasTextContext.h | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/atlastext/SkInternalAtlasTextContext.cpp b/src/atlastext/SkInternalAtlasTextContext.cpp index 6dde9ae096..fba0cbcdbe 100644 --- a/src/atlastext/SkInternalAtlasTextContext.cpp +++ b/src/atlastext/SkInternalAtlasTextContext.cpp @@ -51,7 +51,7 @@ GrTextBlobCache* SkInternalAtlasTextContext::textBlobCache() { GrDeferredUploadToken SkInternalAtlasTextContext::addInlineUpload( GrDeferredTextureUploadFn&& upload) { - auto token = this->nextDrawToken(); + auto token = fTokenTracker.nextDrawToken(); fInlineUploads.append(&fArena, InlineUpload{std::move(upload), token}); return token; } @@ -59,7 +59,7 @@ GrDeferredUploadToken SkInternalAtlasTextContext::addInlineUpload( GrDeferredUploadToken SkInternalAtlasTextContext::addASAPUpload( GrDeferredTextureUploadFn&& upload) { fASAPUploads.append(&fArena, std::move(upload)); - return this->nextTokenToFlush(); + return fTokenTracker.nextTokenToFlush(); } void SkInternalAtlasTextContext::recordDraw(const void* srcVertexData, int glyphCnt, @@ -75,7 +75,8 @@ void SkInternalAtlasTextContext::recordDraw(const void* srcVertexData, int glyph vertex->fTextureCoord.fY /= 2; matrix.mapHomogeneousPoints(&vertex->fPosition, &vertex->fPosition, 1); } - fDraws.append(&fArena, Draw{glyphCnt, this->issueDrawToken(), targetHandle, vertexData}); + fDraws.append(&fArena, + Draw{glyphCnt, fTokenTracker.issueDrawToken(), targetHandle, vertexData}); } void SkInternalAtlasTextContext::flush() { @@ -109,7 +110,7 @@ void SkInternalAtlasTextContext::flush() { auto vertices = reinterpret_cast<const SkAtlasTextRenderer::SDFVertex*>(draw.fVertexData); fRenderer->drawSDFGlyphs(draw.fTargetHandle, fDistanceFieldAtlas.fTextureHandle, vertices, draw.fGlyphCnt); - this->flushToken(); + fTokenTracker.flushToken(); } fASAPUploads.reset(); fInlineUploads.reset(); diff --git a/src/atlastext/SkInternalAtlasTextContext.h b/src/atlastext/SkInternalAtlasTextContext.h index ea89435580..49a55cce15 100644 --- a/src/atlastext/SkInternalAtlasTextContext.h +++ b/src/atlastext/SkInternalAtlasTextContext.h @@ -35,9 +35,9 @@ public: GrAtlasGlyphCache* atlasGlyphCache(); GrTextBlobCache* textBlobCache(); - GrDeferredUploadToken addInlineUpload(GrDeferredTextureUploadFn&&) override; - - GrDeferredUploadToken addASAPUpload(GrDeferredTextureUploadFn&&) override; + const GrTokenTracker* tokenTracker() final { return &fTokenTracker; } + GrDeferredUploadToken addInlineUpload(GrDeferredTextureUploadFn&&) final; + GrDeferredUploadToken addASAPUpload(GrDeferredTextureUploadFn&&) final; void recordDraw(const void* vertexData, int glyphCnt, const SkMatrix&, void* targetHandle); @@ -70,6 +70,7 @@ private: GrDeferredUploadToken fToken; }; + GrTokenTracker fTokenTracker; SkArenaAllocList<InlineUpload> fInlineUploads; SkArenaAllocList<Draw> fDraws; SkArenaAllocList<GrDeferredTextureUploadFn> fASAPUploads; |