organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-13 00:32:59 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 7

[VARC] Port to hb-decycler-t

Browse source 
5% faster on varc-hanzi test case.
This commit is contained in:
Behdad Esfahbod 2025-02-16 10:33:49 -07:00
parent a0f83e783f
commit 4335e49a02
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/OT/Var/VARC/VARC.cc
View file

@ -134,7 +134,7 @@ VarComponent::get_path_at (hb_font_t *font,
hb_array_t<const int> coords,
hb_transform_t total_transform,
hb_ubytes_t total_record,
hb_set_t *visited,
hb_decycler_t *decycler,
signed *edges_left,
signed depth_left,
VarRegionList::cache_t *cache) const
@ -319,7 +319,7 @@ VarComponent::get_path_at (hb_font_t *font,
VARC.get_path_at (font, gid,
draw_session, component_coords, total_transform,
parent_gid,
visited, edges_left, depth_left - 1);
decycler, edges_left, depth_left - 1);
}
#undef PROCESS_TRANSFORM_COMPONENTS
@ -335,13 +335,13 @@ VARC::get_path_at (hb_font_t *font,
hb_array_t<const int> coords,
hb_transform_t transform,
hb_codepoint_t parent_glyph,
hb_set_t *visited,
hb_decycler_t *decycler,
signed *edges_left,
signed depth_left) const
{
hb_set_t stack_set;
if (visited == nullptr)
visited = &stack_set;
hb_decycler_t stack_decycler;
if (decycler == nullptr)
decycler = &stack_decycler;
signed stack_edges = HB_MAX_GRAPH_EDGE_COUNT;
if (edges_left == nullptr)
edges_left = &stack_edges;
@ -377,9 +377,9 @@ VARC::get_path_at (hb_font_t *font,
return true;
(*edges_left)--;
if (visited->has (glyph) || visited->in_error ())
hb_decycler_node_t node (*decycler);
if (unlikely (!node.visit (glyph)))
return true;
visited->add (glyph);
hb_ubytes_t record = (this+glyphRecords)[idx];
@ -392,13 +392,11 @@ VARC::get_path_at (hb_font_t *font,
VarCompositeGlyph::get_path_at (font, glyph,
draw_session, coords, transform,
record,
visited, edges_left, depth_left,
decycler, edges_left, depth_left,
cache);
(this+varStore).destroy_cache (cache);
visited->del (glyph);
return true;
}

9
src/OT/Var/VARC/VARC.hh
View file

@ -1,6 +1,7 @@
#ifndef OT_VAR_VARC_VARC_HH
#define OT_VAR_VARC_VARC_HH
#include "../../../hb-decycler.hh"
#include "../../../hb-geometry.hh"
#include "../../../hb-ot-layout-common.hh"
#include "../../../hb-ot-glyf-table.hh"
@ -49,7 +50,7 @@ struct VarComponent
hb_array_t<const int> coords,
hb_transform_t transform,
hb_ubytes_t record,
hb_set_t *visited,
hb_decycler_t *decycler,
signed *edges_left,
signed depth_left,
VarRegionList::cache_t *cache = nullptr) const;
@ -64,7 +65,7 @@ struct VarCompositeGlyph
hb_array_t<const int> coords,
hb_transform_t transform,
hb_ubytes_t record,
hb_set_t *visited,
hb_decycler_t *decycler,
signed *edges_left,
signed depth_left,
VarRegionList::cache_t *cache = nullptr)
@ -75,7 +76,7 @@ struct VarCompositeGlyph
record = comp.get_path_at (font, glyph,
draw_session, coords, transform,
record,
visited, edges_left, depth_left, cache);
decycler, edges_left, depth_left, cache);
}
}
};
@ -95,7 +96,7 @@ struct VARC
hb_array_t<const int> coords,
hb_transform_t transform = HB_TRANSFORM_IDENTITY,
hb_codepoint_t parent_glyph = HB_CODEPOINT_INVALID,
hb_set_t *visited = nullptr,
hb_decycler_t *decycler = nullptr,
signed *edges_left = nullptr,
signed depth_left = HB_MAX_NESTING_LEVEL) const;