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

use a single point as DirectMaskSubRun's vertex data

Browse Source 
For direct masks, the rectangle passed through the SubRun and the rectangle in the atlas have
the same dimensions. This information is redundant. Instead of passing the glyph origin in pos,
pass the top left corner of the glyph. In onPrepare, use the dimension information to produce the
entire glyph bounding box.

Change-Id: I135d4a144366b39560742797572641e96fe482df
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/307842
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Herb Derby <herb@google.com>
This commit is contained in:
Herb Derby 2020-08-04 15:34:58 -04:00 committed by Skia Commit-Bot
parent 76e7a7f7c5
commit 70df33d24e
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gpu/GrDrawOpAtlas.h
View File

@ -124,6 +124,8 @@ public:
fRect.fBottom -= padding;
}
GrIRect16 rect() const { return fRect; }
private:
friend class GrDrawOpAtlas;

21
src/gpu/text/GrTextBlob.cpp
View File

@ -254,7 +254,7 @@ GrSubRun* GrDirectMaskSubRun::Make(const SkZip<SkGlyphVariant, SkPoint>& drawabl
rb = SkPoint::Make(r, b) + pos;
bounds.joinPossiblyEmptyRect(SkRect::MakeLTRB(lt.x(), lt.y(), rb.x(), rb.y()));
return VertexData{pos, {l, t, r, b}};
return lt;
};
SkSpan<const VertexData> vertexData{
@ -387,23 +387,22 @@ void GrDirectMaskSubRun::fillVertexData(void* vertexDst, int offset, int count,
auto direct2D = [&](auto dst, SkIRect* clip) {
// Rectangles in device space
SkPoint originInDeviceSpace = matrix.mapXY(0, 0);
for (auto[quad, glyph, vertexData] : vertices(dst)) {
auto[pos, rect] = vertexData;
auto[l, t, r, b] = rect;
auto[fx, fy] = pos + originInDeviceSpace;
for (auto[quad, glyph, leftTop] : vertices(dst)) {
GrIRect16 rect = glyph->fAtlasLocator.rect();
int16_t w = rect.width(),
h = rect.height();
auto[al, at, ar, ab] = glyph->fAtlasLocator.getUVs();
auto[fl, ft] = leftTop + originInDeviceSpace;
int l = SkScalarRoundToInt(fl),
t = SkScalarRoundToInt(ft);
if (clip == nullptr) {
SkScalar dx = SkScalarRoundToScalar(fx),
dy = SkScalarRoundToScalar(fy);
auto[dl, dt, dr, db] = SkRect::MakeLTRB(l + dx, t + dy, r + dx, b + dy);
auto[dl, dt, dr, db] = SkRect::MakeLTRB(l, t, l + w, t + h);
quad[0] = {{dl, dt}, color, {al, at}}; // L,T
quad[1] = {{dl, db}, color, {al, ab}}; // L,B
quad[2] = {{dr, dt}, color, {ar, at}}; // R,T
quad[3] = {{dr, db}, color, {ar, ab}}; // R,B
} else {
int dx = SkScalarRoundToInt(fx),
dy = SkScalarRoundToInt(fy);
SkIRect devIRect = SkIRect::MakeLTRB(l + dx, t + dy, r + dx, b + dy);
SkIRect devIRect = SkIRect::MakeLTRB(l, t, l + w, t + h);
SkScalar dl, dt, dr, db;
uint16_t tl, tt, tr, tb;
if (!clip->containsNoEmptyCheck(devIRect)) {

5
src/gpu/text/GrTextBlob.h
View File

@ -314,10 +314,7 @@ private:
// -- GrDirectMaskSubRun ---------------------------------------------------------------------------
class GrDirectMaskSubRun final : public GrAtlasSubRun {
public:
using VertexData = std::tuple<
SkPoint, // glyph position.
GrIRect16 // glyph bounding rectangle.
>;
using VertexData = SkPoint; // The left top corner of the glyph bounding box.
GrDirectMaskSubRun(GrMaskFormat format,
GrTextBlob* blob,