AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for distance field draw large glyph as paths

Browse Source 
BUG=skia:

Review URL: https://codereview.chromium.org/1315933002
This commit is contained in:
joshualitt 2015-08-25 12:05:50 -07:00 committed by Commit bot
parent c64137c245
commit 0fe04a240b
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gpu/GrAtlasTextBlob.h
View File

@ -135,13 +135,17 @@ struct GrAtlasTextBlob : public SkRefCnt {
};
struct BigGlyph {
BigGlyph(const SkPath& path, SkScalar vx, SkScalar vy)
BigGlyph(const SkPath& path, SkScalar vx, SkScalar vy, SkScalar scale, bool applyVM)
: fPath(path)
, fVx(vx)
, fVy(vy) {}
, fVy(vy)
, fScale(scale)
, fApplyVM(applyVM) {}
SkPath fPath;
SkScalar fVx;
SkScalar fVy;
SkScalar fScale;
bool fApplyVM;
};
struct Key {

24
src/gpu/GrAtlasTextContext.cpp
View File

@ -1341,7 +1341,7 @@ bool GrAtlasTextContext::dfAppendGlyph(GrAtlasTextBlob* blob, int runIndex,
// TODO combine with the above
// If the glyph is too large we fall back to paths
if (glyph->fTooLargeForAtlas) {
this->appendGlyphPath(blob, glyph, scaler, skGlyph, sx - dx, sy - dy);
this->appendGlyphPath(blob, glyph, scaler, skGlyph, sx - dx, sy - dy, scale, true);
return true;
}
@ -1363,7 +1363,8 @@ bool GrAtlasTextContext::dfAppendGlyph(GrAtlasTextBlob* blob, int runIndex,
inline void GrAtlasTextContext::appendGlyphPath(GrAtlasTextBlob* blob, GrGlyph* glyph,
GrFontScaler* scaler, const SkGlyph& skGlyph,
SkScalar x, SkScalar y) {
SkScalar x, SkScalar y, SkScalar scale,
bool applyVM) {
if (NULL == glyph->fPath) {
const SkPath* glyphPath = scaler->getGlyphPath(skGlyph);
if (!glyphPath) {
@ -1372,7 +1373,7 @@ inline void GrAtlasTextContext::appendGlyphPath(GrAtlasTextBlob* blob, GrGlyph*
glyph->fPath = SkNEW_ARGS(SkPath, (*glyphPath));
}
blob->fBigGlyphs.push_back(GrAtlasTextBlob::BigGlyph(*glyph->fPath, x, y));
blob->fBigGlyphs.push_back(GrAtlasTextBlob::BigGlyph(*glyph->fPath, x, y, scale, applyVM));
}
inline void GrAtlasTextContext::appendGlyphCommon(GrAtlasTextBlob* blob, Run* run,
@ -1931,6 +1932,7 @@ private:
// TODO see note above
if (kLCDDistanceField_MaskType == fMaskType && this->color() != that->color()) {
return false;
}
}
@ -2158,21 +2160,19 @@ inline void GrAtlasTextContext::flushBigGlyphs(GrAtlasTextBlob* cacheBlob, GrRen
return;
}
SkMatrix pathMatrix;
if (!cacheBlob->fViewMatrix.invert(&pathMatrix)) {
SkDebugf("could not invert viewmatrix\n");
return;
}
for (int i = 0; i < cacheBlob->fBigGlyphs.count(); i++) {
GrAtlasTextBlob::BigGlyph& bigGlyph = cacheBlob->fBigGlyphs[i];
bigGlyph.fVx += transX;
bigGlyph.fVy += transY;
SkMatrix translate = cacheBlob->fViewMatrix;
translate.postTranslate(bigGlyph.fVx, bigGlyph.fVy);
SkMatrix ctm;
ctm.setScale(bigGlyph.fScale, bigGlyph.fScale);
ctm.postTranslate(bigGlyph.fVx, bigGlyph.fVy);
if (bigGlyph.fApplyVM) {
ctm.postConcat(cacheBlob->fViewMatrix);
}
GrBlurUtils::drawPathWithMaskFilter(fContext, fDrawContext, rt, clip, bigGlyph.fPath,
skPaint, translate, &pathMatrix, clipBounds, false);
skPaint, ctm, nullptr, clipBounds, false);
}
}

3
src/gpu/GrAtlasTextContext.h
View File

@ -65,7 +65,8 @@ private:
GrColor color, GrFontScaler*, const SkIRect& clipRect, SkScalar textRatio,
const SkMatrix& viewMatrix);
inline void appendGlyphPath(GrAtlasTextBlob*, GrGlyph*, GrFontScaler*, const SkGlyph&,
SkScalar x, SkScalar y);
SkScalar x, SkScalar y, SkScalar scale = 1.0f,
bool applyVM = false);
inline void appendGlyphCommon(GrAtlasTextBlob*, Run*, Run::SubRunInfo*,
const SkRect& positions, GrColor color,
size_t vertexStride, bool useVertexColor,