diff options
| author |  joshualitt <joshualitt@google.com> | 2015-04-07 10:21:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-07 10:21:27 -0700 |
| commit | 3cf9863bb658d637416c4edbf278b0311dba7478 (patch) | |
| tree | 32326eb6636e2326baf8ce910bd454798426fce1 /src/gpu/GrAtlasTextContext.cpp | |
| parent | 7281c61e7bc689d484dcbda49be3cef4ce4f11c2 (diff) | |
Revert of Adding bulk plot reffer to cached textblobs (patchset #7 id:110001 of https://codereview.chromium.org/1050113004/)
Reason for revert:
Breaks linux builder
Original issue's description:
> Adding bulk plot reffer to cached textblobs
>
> This change will prevent the atlas from evicting glyphs the TextBlob
> needs.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/7281c61e7bc689d484dcbda49be3cef4ce4f11c2
TBR=bsalomon@google.com,jvanverth@google.com,robertphillips@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1061713003
Diffstat (limited to 'src/gpu/GrAtlasTextContext.cpp')
| -rw-r--r-- | src/gpu/GrAtlasTextContext.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp index 38edc8e558..08e6a9a25e 100644 --- a/src/gpu/GrAtlasTextContext.cpp +++ b/src/gpu/GrAtlasTextContext.cpp @@ -821,7 +821,6 @@ public: GrBatchTextStrike* strike = NULL; bool brokenRun = false; if (regenerateTextureCoords) { - info.fBulkUseToken.reset(); desc = run.fDescriptor.getDesc(); cache = SkGlyphCache::DetachCache(run.fTypeface, desc); scaler = GrTextContext::GetGrFontScaler(cache); @@ -847,8 +846,8 @@ public: scaler); SkASSERT(success); } - fFontCache->addGlyphToBulkAndSetUseToken(&info.fBulkUseToken, glyph, - batchTarget->currentToken()); + + fFontCache->setGlyphRefToken(glyph, batchTarget->currentToken()); // Texture coords are the last vertex attribute so we get a pointer to the // first one and then map with stride in regenerateTextureCoords @@ -877,12 +876,6 @@ public: } } else { instancesToFlush += glyphCount; - - // set use tokens for all of the glyphs in our subrun. This is only valid if we - // have a valid atlas generation - fFontCache->setUseTokenBulk(info.fBulkUseToken, - batchTarget->currentToken(), - fMaskFormat); } // now copy all vertices |