walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Coverage/SingleSubst] Move hand-written loop to Coverage

This commit is contained in:
Behdad Esfahbod 2022-07-21 12:34:46 -06:00
parent 7b95783efb
commit bbb4db90dd
2 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/OT/Layout/Common/CoverageFormat2.hh
View File

@ -141,6 +141,9 @@ struct CoverageFormat2_4
template <typename IterableOut,
hb_requires (hb_is_sink_of (IterableOut, hb_codepoint_t))>
void intersect_set (const hb_set_t &glyphs, IterableOut &intersect_glyphs) const
{
/* Why the second branch is >2x faster I have no idea, but it seems to be. */
if (0)
{
for (const auto& range : rangeRecord)
{
@ -150,6 +153,28 @@ struct CoverageFormat2_4
intersect_glyphs << g;
}
}
else
{
iter_t c_iter;
c_iter.init (*this);
auto s_iter = hb_iter (glyphs);
while (c_iter.__more__ () && s_iter)
{
hb_codepoint_t cv = c_iter.get_glyph ();
hb_codepoint_t sv = *s_iter;
if (cv == sv)
{
intersect_glyphs << cv;
c_iter.__next__ ();
s_iter++;
}
else if (cv < sv)
c_iter.__next__ ();
else
s_iter++;
}
}
}
template <typename set_t>
bool collect_coverage (set_t *glyphs) const

24
src/OT/Layout/GSUB/SingleSubstFormat1.hh
View File

@ -42,29 +42,6 @@ struct SingleSubstFormat1_3
hb_codepoint_t d = deltaGlyphID;
hb_codepoint_t mask = get_mask ();
if (1)
{
/* Somehow this branch is much faster. Can't understand why. */
auto c_iter = hb_iter (this+coverage);
auto s_iter = hb_iter (c->parent_active_glyphs ());
while (c_iter && s_iter)
{
hb_codepoint_t cv = *c_iter;
hb_codepoint_t sv = *s_iter;
if (cv == sv)
{
c->output->add ((cv + d) & mask);
c_iter++;
s_iter++;
}
else if (cv < sv)
c_iter++;
else
s_iter++;
}
}
else
{
hb_set_t intersection;
(this+coverage).intersect_set (c->parent_active_glyphs (), intersection);
@ -73,7 +50,6 @@ struct SingleSubstFormat1_3
| hb_sink (c->output)
;
}
}
void closure_lookups (hb_closure_lookups_context_t *c) const {}