diff options
-rw-r--r-- | src/gpu/text/GrAtlasTextBlob.cpp | 12 | ||||
-rw-r--r-- | src/gpu/text/GrAtlasTextBlob.h | 11 | ||||
-rw-r--r-- | src/gpu/text/GrAtlasTextContext.cpp | 83 |
3 files changed, 50 insertions, 56 deletions
diff --git a/src/gpu/text/GrAtlasTextBlob.cpp b/src/gpu/text/GrAtlasTextBlob.cpp index acb8a6d400..72ddac3167 100644 --- a/src/gpu/text/GrAtlasTextBlob.cpp +++ b/src/gpu/text/GrAtlasTextBlob.cpp @@ -55,11 +55,11 @@ sk_sp<GrAtlasTextBlob> GrAtlasTextBlob::Make(GrMemoryPool* pool, int glyphCount, return cacheBlob; } -SkGlyphCache* GrAtlasTextBlob::setupCache(int runIndex, - const SkSurfaceProps& props, - SkScalerContextFlags scalerContextFlags, - const SkPaint& skPaint, - const SkMatrix* viewMatrix) { +SkExclusiveStrikePtr GrAtlasTextBlob::setupCache(int runIndex, + const SkSurfaceProps& props, + SkScalerContextFlags scalerContextFlags, + const SkPaint& skPaint, + const SkMatrix* viewMatrix) { GrAtlasTextBlob::Run* run = &fRuns[runIndex]; // if we have an override descriptor for the run, then we should use that @@ -71,7 +71,7 @@ SkGlyphCache* GrAtlasTextBlob::setupCache(int runIndex, run->fTypeface = SkPaintPriv::RefTypefaceOrDefault(skPaint); run->fPathEffect = sk_ref_sp(effects.fPathEffect); run->fMaskFilter = sk_ref_sp(effects.fMaskFilter); - return SkGlyphCache::DetachCache(run->fTypeface.get(), effects, desc->getDesc()); + return SkGlyphCache::FindOrCreateStrikeExclusive(*desc->getDesc(), effects, *run->fTypeface); } void GrAtlasTextBlob::appendGlyph(int runIndex, diff --git a/src/gpu/text/GrAtlasTextBlob.h b/src/gpu/text/GrAtlasTextBlob.h index 129e7852b0..e3fc53b827 100644 --- a/src/gpu/text/GrAtlasTextBlob.h +++ b/src/gpu/text/GrAtlasTextBlob.h @@ -25,7 +25,6 @@ class GrAtlasManager; struct GrDistanceFieldAdjustTable; struct GrGlyph; -class GrGlyphCache; class GrMemoryPool; class SkDrawFilter; @@ -169,11 +168,11 @@ public: run.fOverrideDescriptor.reset(new SkAutoDescriptor); } - SkGlyphCache* setupCache(int runIndex, - const SkSurfaceProps& props, - SkScalerContextFlags scalerContextFlags, - const SkPaint& skPaint, - const SkMatrix* viewMatrix); + SkExclusiveStrikePtr setupCache(int runIndex, + const SkSurfaceProps& props, + SkScalerContextFlags scalerContextFlags, + const SkPaint& skPaint, + const SkMatrix* viewMatrix); // Appends a glyph to the blob. If the glyph is too large, the glyph will be appended // as a path. diff --git a/src/gpu/text/GrAtlasTextContext.cpp b/src/gpu/text/GrAtlasTextContext.cpp index 6b0cc9e2fd..96afe1adf2 100644 --- a/src/gpu/text/GrAtlasTextContext.cpp +++ b/src/gpu/text/GrAtlasTextContext.cpp @@ -384,19 +384,17 @@ void GrAtlasTextContext::DrawBmpText(GrAtlasTextBlob* blob, int runIndex, } sk_sp<GrTextStrike> currStrike; - SkGlyphCache* cache = blob->setupCache(runIndex, props, scalerContextFlags, paint, &viewMatrix); + auto cache = blob->setupCache(runIndex, props, scalerContextFlags, paint, &viewMatrix); SkFindAndPlaceGlyph::ProcessText(paint.skPaint().getTextEncoding(), text, byteLength, {x, y}, - viewMatrix, paint.skPaint().getTextAlign(), cache, + viewMatrix, paint.skPaint().getTextAlign(), cache.get(), [&](const SkGlyph& glyph, SkPoint position, SkPoint rounding) { position += rounding; BmpAppendGlyph(blob, runIndex, glyphCache, &currStrike, glyph, SkScalarFloorToScalar(position.fX), SkScalarFloorToScalar(position.fY), - paint.filteredPremulColor(), cache, + paint.filteredPremulColor(), cache.get(), SK_Scalar1); }); - - SkGlyphCache::AttachCache(cache); } void GrAtlasTextContext::DrawBmpPosText(GrAtlasTextBlob* blob, int runIndex, @@ -424,19 +422,17 @@ void GrAtlasTextContext::DrawBmpPosText(GrAtlasTextBlob* blob, int runIndex, } sk_sp<GrTextStrike> currStrike; - SkGlyphCache* cache = blob->setupCache(runIndex, props, scalerContextFlags, paint, &viewMatrix); + auto cache = blob->setupCache(runIndex, props, scalerContextFlags, paint, &viewMatrix); SkFindAndPlaceGlyph::ProcessPosText( paint.skPaint().getTextEncoding(), text, byteLength, offset, viewMatrix, pos, - scalarsPerPosition, paint.skPaint().getTextAlign(), cache, + scalarsPerPosition, paint.skPaint().getTextAlign(), cache.get(), [&](const SkGlyph& glyph, SkPoint position, SkPoint rounding) { position += rounding; BmpAppendGlyph(blob, runIndex, glyphCache, &currStrike, glyph, SkScalarFloorToScalar(position.fX), SkScalarFloorToScalar(position.fY), - paint.filteredPremulColor(), cache, SK_Scalar1); + paint.filteredPremulColor(), cache.get(), SK_Scalar1); }); - - SkGlyphCache::AttachCache(cache); } void GrAtlasTextContext::DrawBmpTextAsPaths(GrAtlasTextBlob* blob, int runIndex, @@ -773,42 +769,43 @@ void GrAtlasTextContext::drawDFPosText(GrAtlasTextBlob* blob, int runIndex, sk_sp<GrTextStrike> currStrike; - // We apply the fake-gamma by altering the distance in the shader, so we ignore the - // passed-in scaler context flags. (It's only used when we fall-back to bitmap text). - SkGlyphCache* cache = - blob->setupCache(runIndex, props, SkScalerContextFlags::kNone, dfPaint, nullptr); - SkPaint::GlyphCacheProc glyphCacheProc = + { + // We apply the fake-gamma by altering the distance in the shader, so we ignore the + // passed-in scaler context flags. (It's only used when we fall-back to bitmap text). + auto cache = blob->setupCache(runIndex, props, SkScalerContextFlags::kNone, dfPaint, + nullptr); + SkPaint::GlyphCacheProc glyphCacheProc = SkPaint::GetGlyphCacheProc(dfPaint.getTextEncoding(), dfPaint.isDevKernText(), true); - const char* stop = text + byteLength; + const char* stop = text + byteLength; - SkPaint::Align align = dfPaint.getTextAlign(); - SkScalar alignMul = SkPaint::kCenter_Align == align ? SK_ScalarHalf : - (SkPaint::kRight_Align == align ? SK_Scalar1 : 0); - while (text < stop) { - const char* lastText = text; - // the last 2 parameters are ignored - const SkGlyph& glyph = glyphCacheProc(cache, &text); - - if (glyph.fWidth) { - SkPoint glyphPos(offset); - glyphPos.fX += pos[0] - SkFloatToScalar(glyph.fAdvanceX) * alignMul * textRatio; - glyphPos.fY += (2 == scalarsPerPosition ? pos[1] : 0) - - SkFloatToScalar(glyph.fAdvanceY) * alignMul * textRatio; - - if (glyph.fMaskFormat != SkMask::kARGB32_Format) { - DfAppendGlyph(blob, runIndex, glyphCache, &currStrike, glyph, glyphPos.fX, - glyphPos.fY, paint.filteredPremulColor(), cache, textRatio); - } else { - // can't append color glyph to SDF batch, send to fallback - fallbackTextHelper.appendText(glyph, SkToInt(text - lastText), lastText, glyphPos); + SkPaint::Align align = dfPaint.getTextAlign(); + SkScalar alignMul = SkPaint::kCenter_Align == align ? SK_ScalarHalf : + (SkPaint::kRight_Align == align ? SK_Scalar1 : 0); + while (text < stop) { + const char* lastText = text; + // the last 2 parameters are ignored + const SkGlyph& glyph = glyphCacheProc(cache.get(), &text); + + if (glyph.fWidth) { + SkPoint glyphPos(offset); + glyphPos.fX += pos[0] - SkFloatToScalar(glyph.fAdvanceX) * alignMul * textRatio; + glyphPos.fY += (2 == scalarsPerPosition ? pos[1] : 0) - + SkFloatToScalar(glyph.fAdvanceY) * alignMul * textRatio; + + if (glyph.fMaskFormat != SkMask::kARGB32_Format) { + DfAppendGlyph(blob, runIndex, glyphCache, &currStrike, glyph, glyphPos.fX, + glyphPos.fY, paint.filteredPremulColor(), cache.get(), textRatio); + } else { + // can't append color glyph to SDF batch, send to fallback + fallbackTextHelper.appendText(glyph, SkToInt(text - lastText), lastText, + glyphPos); + } } + pos += scalarsPerPosition; } - pos += scalarsPerPosition; } - SkGlyphCache::AttachCache(cache); - fallbackTextHelper.drawText(blob, runIndex, glyphCache, props, paint, scalerContextFlags); } @@ -880,7 +877,7 @@ void GrAtlasTextContext::FallbackTextHelper::drawText(GrAtlasTextBlob* blob, int if (fFallbackTxt.count()) { blob->initOverride(runIndex); blob->setHasBitmap(); - SkGlyphCache* cache = nullptr; + SkExclusiveStrikePtr cache; const SkPaint& skPaint = paint.skPaint(); SkPaint::GlyphCacheProc glyphCacheProc = SkPaint::GetGlyphCacheProc(skPaint.getTextEncoding(), @@ -910,14 +907,12 @@ void GrAtlasTextContext::FallbackTextHelper::drawText(GrAtlasTextBlob* blob, int const char* stop = text + fFallbackTxt.count(); SkPoint* glyphPos = fFallbackPos.begin(); while (text < stop) { - const SkGlyph& glyph = glyphCacheProc(cache, &text); + const SkGlyph& glyph = glyphCacheProc(cache.get(), &text); GrAtlasTextContext::BmpAppendGlyph(blob, runIndex, glyphCache, &currStrike, glyph, glyphPos->fX, glyphPos->fY, textColor, - cache, textRatio); + cache.get(), textRatio); glyphPos++; } - - SkGlyphCache::AttachCache(cache); } } |