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

Revert "Add glyph dimensions to SkGlyphDigest"

Browse Source 
This reverts commit 4831018d05.

Reason for revert: Broke tests on Test-Win2019-MSVC-GCE-CPU-AVX2-x86-Release-All and Test-Win2019-MSVC-GCE-CPU-AVX2-x86-Debug-All bots

Original change's description:
> Add glyph dimensions to SkGlyphDigest
>
> Add dimensions to the glyph digest to enable SkRemoteGlyphCache to build
> SubRuns directly.
>
> Bug: skia:13192
> Change-Id: I8e68fe4ef144344347d4bc23865821d8517709fc
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/529517
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Commit-Queue: Herb Derby <herb@google.com>

Bug: skia:13192
Change-Id: I14e9763ff015558e046f77211490c94a33c80df1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/529558
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Arman Uguray <armansito@google.com>
This commit is contained in:
Arman Uguray 2022-04-12 20:53:41 +00:00 committed by SkCQ
parent e0934a67a7
commit 77ed5fcfbe
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/SkGlyph.cpp
View File

@ -402,4 +402,4 @@ SkGlyphDigest::SkGlyphDigest(size_t index, const SkGlyph& glyph)
, fIsColor(glyph.isColor())
, fCanDrawAsMask{SkStrikeForGPU::CanDrawAsMask(glyph)}
, fCanDrawAsSDFT{SkStrikeForGPU::CanDrawAsSDFT(glyph)}
, fBounds{glyph.glyphRect()} {}
, fMaxDimension{(uint16_t)glyph.maxDimension()} {}

29
src/core/SkGlyph.h
View File

@ -260,26 +260,21 @@ public:
// Default ctor is only needed for the hash table.
SkGlyphDigest() = default;
SkGlyphDigest(size_t index, const SkGlyph& glyph);
int index() const { return fIndex; }
bool isEmpty() const { return fIsEmpty; }
bool isColor() const { return fIsColor; }
bool canDrawAsMask() const { return fCanDrawAsMask; }
bool canDrawAsSDFT() const { return fCanDrawAsSDFT; }
uint16_t maxDimension() const {
auto [width, height] = fBounds.widthHeight();
return std::max(width.val, height.val);
}
int index() const {return fIndex; }
bool isEmpty() const {return fIsEmpty; }
bool isColor() const {return fIsColor; }
bool canDrawAsMask() const {return fCanDrawAsMask;}
bool canDrawAsSDFT() const {return fCanDrawAsSDFT;}
uint16_t maxDimension() const {return fMaxDimension; }
private:
static_assert(SkPackedGlyphID::kEndData == 20);
struct {
uint32_t fIndex : SkPackedGlyphID::kEndData;
bool fIsEmpty : 1;
bool fIsColor : 1;
bool fCanDrawAsMask : 1;
bool fCanDrawAsSDFT : 1;
};
SkGlyphRect fBounds;
uint64_t fIndex : SkPackedGlyphID::kEndData;
uint64_t fIsEmpty : 1;
uint64_t fIsColor : 1;
uint64_t fCanDrawAsMask : 1;
uint64_t fCanDrawAsSDFT : 1;
uint64_t fMaxDimension : 16;
};
class SkGlyph {