From 82a0d4bd0362cb1c23b8c9a3e9222d135a757d33 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 21 Dec 2025 20:18:21 -0700 Subject: [PATCH 1/4] [TupleValues] Inline ensure_run fastpath --- src/hb-open-type.hh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh index 61ee139db..94a5c0351 100644 --- a/src/hb-open-type.hh +++ b/src/hb-open-type.hh @@ -1802,7 +1802,7 @@ struct TupleValues { iter_t (const unsigned char *p_, unsigned len_) : p (p_), endp (p_ + len_) - { if (ensure_run ()) read_value (); } + { if (likely (ensure_run ())) read_value (); } private: const unsigned char *p; @@ -1811,10 +1811,14 @@ struct TupleValues signed run_count = 0; unsigned width = 0; + HB_ALWAYS_INLINE bool ensure_run () { if (likely (run_count > 0)) return true; - + return _ensure_run (); + } + bool _ensure_run () + { if (unlikely (p >= endp)) { run_count = 0; @@ -1904,10 +1908,15 @@ struct TupleValues signed run_count = 0; unsigned width = 0; + HB_ALWAYS_INLINE bool ensure_run () { - if (run_count > 0) return true; + if (likely (run_count > 0)) return true; + return _ensure_run (); + } + bool _ensure_run () + { if (unlikely (p >= end)) { run_count = 0; From 19ab59f2f66b77ed90521cd662ee781db43ca079 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 21 Dec 2025 20:32:21 -0700 Subject: [PATCH 2/4] [scalar-cache] Unroll a loop --- src/hb-ot-layout-common.hh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index dff402068..5c0533aad 100644 --- a/src/hb-ot-layout-common.hh +++ b/src/hb-ot-layout-common.hh @@ -2586,7 +2586,17 @@ struct hb_scalar_cache_t void clear () { auto *values = &static_values[0]; - for (unsigned i = 0; i < length; i++) + unsigned i = 0; +#ifndef HB_OPTIMIZE_SIZE + for (; i + 3 < length; i += 4) + { + values[i + 0] = INVALID; + values[i + 1] = INVALID; + values[i + 2] = INVALID; + values[i + 3] = INVALID; + } +#endif + for (; i < length; i++) values[i] = INVALID; } From 2c0dbf1f92f60d701ae3f3a2a1e696b22c844977 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 21 Dec 2025 20:56:52 -0700 Subject: [PATCH 3/4] [VARC] Use non-thread-safe scalar-cache Since the cache is local to the draw() call. However, this seems to slow down thing for reasons I don't understand. Going to revert. --- src/OT/Var/VARC/VARC.cc | 14 +++++----- src/OT/Var/VARC/VARC.hh | 6 ++--- src/hb-ot-layout-common.hh | 54 +++++++++++++++++++++++++++----------- 3 files changed, 49 insertions(+), 25 deletions(-) diff --git a/src/OT/Var/VARC/VARC.cc b/src/OT/Var/VARC/VARC.cc index 1a22f1d81..d55e6227f 100644 --- a/src/OT/Var/VARC/VARC.cc +++ b/src/OT/Var/VARC/VARC.cc @@ -134,7 +134,7 @@ VarComponent::get_path_at (const hb_varc_context_t &c, hb_array_t coords, hb_transform_t<> total_transform, hb_ubytes_t total_record, - hb_scalar_cache_t *cache) const + _hb_scalar_cache_t *cache) const { const unsigned char *end = total_record.arrayZ + total_record.length; const unsigned char *record = total_record.arrayZ; @@ -183,7 +183,7 @@ VarComponent::get_path_at (const hb_varc_context_t &c, unsigned conditionIndex; READ_UINT32VAR (conditionIndex); const auto &condition = (&VARC+VARC.conditionList)[conditionIndex]; - auto instancer = MultiItemVarStoreInstancer(&varStore, nullptr, coords, cache); + auto instancer = MultiItemVarStoreInstancer (&varStore, nullptr, coords, cache); show = condition.evaluate (coords.arrayZ, coords.length, &instancer); } @@ -338,7 +338,7 @@ VARC::get_path_at (const hb_varc_context_t &c, hb_array_t coords, hb_transform_t<> transform, hb_codepoint_t parent_glyph, - hb_scalar_cache_t *parent_cache) const + _hb_scalar_cache_t *parent_cache) const { // Don't recurse on the same glyph. unsigned idx = glyph == parent_glyph ? @@ -394,10 +394,10 @@ VARC::get_path_at (const hb_varc_context_t &c, hb_ubytes_t record = (this+glyphRecords)[idx]; - hb_scalar_cache_t static_cache; - hb_scalar_cache_t *cache = parent_cache ? - parent_cache : - (this+varStore).create_cache (&static_cache); + _hb_scalar_cache_t static_cache; + _hb_scalar_cache_t *cache = parent_cache ? + parent_cache : + (this+varStore).create_cache (&static_cache); transform.scale (c.font->x_multf, c.font->y_multf); diff --git a/src/OT/Var/VARC/VARC.hh b/src/OT/Var/VARC/VARC.hh index 719302c93..5d9c672a4 100644 --- a/src/OT/Var/VARC/VARC.hh +++ b/src/OT/Var/VARC/VARC.hh @@ -67,7 +67,7 @@ struct VarComponent hb_array_t coords, hb_transform_t<> transform, hb_ubytes_t record, - hb_scalar_cache_t *cache = nullptr) const; + _hb_scalar_cache_t *cache = nullptr) const; }; struct VarCompositeGlyph @@ -78,7 +78,7 @@ struct VarCompositeGlyph hb_array_t coords, hb_transform_t<> transform, hb_ubytes_t record, - hb_scalar_cache_t *cache) + _hb_scalar_cache_t *cache) { while (record) { @@ -106,7 +106,7 @@ struct VARC hb_array_t coords, hb_transform_t<> transform = HB_TRANSFORM_IDENTITY, hb_codepoint_t parent_gid = HB_CODEPOINT_INVALID, - hb_scalar_cache_t *parent_cache = nullptr) const; + _hb_scalar_cache_t *parent_cache = nullptr) const; bool get_path (hb_font_t *font, diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index 5c0533aad..7da14bbc0 100644 --- a/src/hb-ot-layout-common.hh +++ b/src/hb-ot-layout-common.hh @@ -2540,7 +2540,8 @@ struct SparseVarRegionAxis DEFINE_SIZE_STATIC (8); }; -struct hb_scalar_cache_t +template +struct _hb_scalar_cache_t { private: static constexpr unsigned STATIC_LENGTH = 16; @@ -2549,17 +2550,17 @@ struct hb_scalar_cache_t static constexpr float DIVISOR = 1.f / MULTIPLIER; public: - hb_scalar_cache_t () : length (STATIC_LENGTH) { clear (); } + _hb_scalar_cache_t () : length (STATIC_LENGTH) { clear (); } - hb_scalar_cache_t (const hb_scalar_cache_t&) = delete; - hb_scalar_cache_t (hb_scalar_cache_t&&) = delete; - hb_scalar_cache_t& operator= (const hb_scalar_cache_t&) = delete; - hb_scalar_cache_t& operator= (hb_scalar_cache_t&&) = delete; + _hb_scalar_cache_t (const _hb_scalar_cache_t&) = delete; + _hb_scalar_cache_t (_hb_scalar_cache_t&&) = delete; + _hb_scalar_cache_t& operator= (const _hb_scalar_cache_t&) = delete; + _hb_scalar_cache_t& operator= (_hb_scalar_cache_t&&) = delete; - static hb_scalar_cache_t *create (unsigned int count, - hb_scalar_cache_t *scratch_cache = nullptr) + static _hb_scalar_cache_t *create (unsigned int count, + _hb_scalar_cache_t *scratch_cache = nullptr) { - if (!count) return (hb_scalar_cache_t *) &Null(hb_scalar_cache_t); + if (!count) return (_hb_scalar_cache_t *) &Null(_hb_scalar_cache_t); if (scratch_cache && count <= scratch_cache->length) { @@ -2567,8 +2568,8 @@ struct hb_scalar_cache_t return scratch_cache; } - auto *cache = (hb_scalar_cache_t *) hb_malloc (sizeof (hb_scalar_cache_t) - sizeof (static_values) + sizeof (static_values[0]) * count); - if (unlikely (!cache)) return (hb_scalar_cache_t *) &Null(hb_scalar_cache_t); + auto *cache = (_hb_scalar_cache_t *) hb_malloc (sizeof (_hb_scalar_cache_t) - sizeof (static_values) + sizeof (static_values[0]) * count); + if (unlikely (!cache)) return (_hb_scalar_cache_t *) &Null(_hb_scalar_cache_t); cache->length = count; cache->clear (); @@ -2576,10 +2577,10 @@ struct hb_scalar_cache_t return cache; } - static void destroy (hb_scalar_cache_t *cache, - hb_scalar_cache_t *scratch_cache = nullptr) + static void destroy (_hb_scalar_cache_t *cache, + _hb_scalar_cache_t *scratch_cache = nullptr) { - if (cache != &Null(hb_scalar_cache_t) && cache != scratch_cache) + if (cache != &Null(_hb_scalar_cache_t) && cache != scratch_cache) hb_free (cache); } @@ -2632,11 +2633,15 @@ struct hb_scalar_cache_t *cached_value = roundf(value * MULTIPLIER); } + using type_t = std::conditional_t, int>; + private: unsigned length; - mutable hb_atomic_t static_values[STATIC_LENGTH]; + mutable type_t static_values[STATIC_LENGTH]; }; +using hb_scalar_cache_t = _hb_scalar_cache_t; + struct VarRegionList { private: @@ -2663,6 +2668,7 @@ struct VarRegionList } public: + template HB_ALWAYS_INLINE float evaluate (unsigned int region_index, const int *coords, unsigned int coord_len, @@ -2821,6 +2827,7 @@ struct SparseVariationRegion : Array16Of struct SparseVarRegionList { + template HB_ALWAYS_INLINE float evaluate (unsigned int region_index, const int *coords, unsigned int coord_len, @@ -2876,6 +2883,7 @@ struct VarData + itemCount * get_row_size (); } + template float _get_delta (unsigned int inner, const int *coords, unsigned int coord_count, const VarRegionList ®ions, @@ -2923,6 +2931,7 @@ struct VarData return delta; } + template HB_ALWAYS_INLINE float get_delta (unsigned int inner, const int *coords, unsigned int coord_count, @@ -3246,6 +3255,7 @@ struct MultiVarData + StructAfter (regionIndices).get_size (); } + template void get_delta (unsigned int inner, const int *coords, unsigned int coord_count, const SparseVarRegionList ®ions, @@ -3288,6 +3298,7 @@ struct ItemVariationStore { friend struct item_variations_t; + template hb_scalar_cache_t *create_cache () const { #ifdef HB_NO_VAR @@ -3296,12 +3307,14 @@ struct ItemVariationStore return hb_scalar_cache_t::create ((this+regions).regionCount); } + template static void destroy_cache (hb_scalar_cache_t *cache) { hb_scalar_cache_t::destroy (cache); } private: + template float get_delta (unsigned int outer, unsigned int inner, const int *coords, unsigned int coord_count, hb_scalar_cache_t *cache = nullptr) const @@ -3320,6 +3333,7 @@ struct ItemVariationStore } public: + template float get_delta (unsigned int index, const int *coords, unsigned int coord_count, hb_scalar_cache_t *cache = nullptr) const @@ -3328,6 +3342,7 @@ struct ItemVariationStore unsigned int inner = index & 0xFFFF; return get_delta (outer, inner, coords, coord_count, cache); } + template float get_delta (unsigned int index, hb_array_t coords, hb_scalar_cache_t *cache = nullptr) const @@ -3538,6 +3553,7 @@ struct ItemVariationStore struct MultiItemVariationStore { + template hb_scalar_cache_t *create_cache (hb_scalar_cache_t *static_cache = nullptr) const { #ifdef HB_NO_VAR @@ -3549,6 +3565,7 @@ struct MultiItemVariationStore return hb_scalar_cache_t::create (count, static_cache); } + template static void destroy_cache (hb_scalar_cache_t *cache, hb_scalar_cache_t *static_cache = nullptr) { @@ -3556,6 +3573,7 @@ struct MultiItemVariationStore } private: + template void get_delta (unsigned int outer, unsigned int inner, const int *coords, unsigned int coord_count, hb_array_t out, @@ -3576,6 +3594,7 @@ struct MultiItemVariationStore } public: + template void get_delta (unsigned int index, const int *coords, unsigned int coord_count, hb_array_t out, @@ -3585,6 +3604,7 @@ struct MultiItemVariationStore unsigned int inner = index & 0xFFFF; get_delta (outer, inner, coords, coord_count, out, cache); } + template void get_delta (unsigned int index, hb_array_t coords, hb_array_t out, @@ -3847,8 +3867,11 @@ struct ItemVarStoreInstancer hb_scalar_cache_t *cache; }; +template struct MultiItemVarStoreInstancer { + using hb_scalar_cache_t = _hb_scalar_cache_t; + MultiItemVarStoreInstancer (const MultiItemVariationStore *varStore, const DeltaSetIndexMap *varIdxMap, hb_array_t coords, @@ -4903,6 +4926,7 @@ struct VariationDevice private: + template float get_delta (hb_font_t *font, const ItemVariationStore &store, hb_scalar_cache_t *store_cache = nullptr) const From f6ba182e6582fb35c616c96f3e91073d45bb1076 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 21 Dec 2025 20:57:42 -0700 Subject: [PATCH 4/4] Revert "[VARC] Use non-thread-safe scalar-cache" This reverts commit 2c0dbf1f92f60d701ae3f3a2a1e696b22c844977. --- src/OT/Var/VARC/VARC.cc | 14 +++++----- src/OT/Var/VARC/VARC.hh | 6 ++--- src/hb-ot-layout-common.hh | 54 +++++++++++--------------------------- 3 files changed, 25 insertions(+), 49 deletions(-) diff --git a/src/OT/Var/VARC/VARC.cc b/src/OT/Var/VARC/VARC.cc index d55e6227f..1a22f1d81 100644 --- a/src/OT/Var/VARC/VARC.cc +++ b/src/OT/Var/VARC/VARC.cc @@ -134,7 +134,7 @@ VarComponent::get_path_at (const hb_varc_context_t &c, hb_array_t coords, hb_transform_t<> total_transform, hb_ubytes_t total_record, - _hb_scalar_cache_t *cache) const + hb_scalar_cache_t *cache) const { const unsigned char *end = total_record.arrayZ + total_record.length; const unsigned char *record = total_record.arrayZ; @@ -183,7 +183,7 @@ VarComponent::get_path_at (const hb_varc_context_t &c, unsigned conditionIndex; READ_UINT32VAR (conditionIndex); const auto &condition = (&VARC+VARC.conditionList)[conditionIndex]; - auto instancer = MultiItemVarStoreInstancer (&varStore, nullptr, coords, cache); + auto instancer = MultiItemVarStoreInstancer(&varStore, nullptr, coords, cache); show = condition.evaluate (coords.arrayZ, coords.length, &instancer); } @@ -338,7 +338,7 @@ VARC::get_path_at (const hb_varc_context_t &c, hb_array_t coords, hb_transform_t<> transform, hb_codepoint_t parent_glyph, - _hb_scalar_cache_t *parent_cache) const + hb_scalar_cache_t *parent_cache) const { // Don't recurse on the same glyph. unsigned idx = glyph == parent_glyph ? @@ -394,10 +394,10 @@ VARC::get_path_at (const hb_varc_context_t &c, hb_ubytes_t record = (this+glyphRecords)[idx]; - _hb_scalar_cache_t static_cache; - _hb_scalar_cache_t *cache = parent_cache ? - parent_cache : - (this+varStore).create_cache (&static_cache); + hb_scalar_cache_t static_cache; + hb_scalar_cache_t *cache = parent_cache ? + parent_cache : + (this+varStore).create_cache (&static_cache); transform.scale (c.font->x_multf, c.font->y_multf); diff --git a/src/OT/Var/VARC/VARC.hh b/src/OT/Var/VARC/VARC.hh index 5d9c672a4..719302c93 100644 --- a/src/OT/Var/VARC/VARC.hh +++ b/src/OT/Var/VARC/VARC.hh @@ -67,7 +67,7 @@ struct VarComponent hb_array_t coords, hb_transform_t<> transform, hb_ubytes_t record, - _hb_scalar_cache_t *cache = nullptr) const; + hb_scalar_cache_t *cache = nullptr) const; }; struct VarCompositeGlyph @@ -78,7 +78,7 @@ struct VarCompositeGlyph hb_array_t coords, hb_transform_t<> transform, hb_ubytes_t record, - _hb_scalar_cache_t *cache) + hb_scalar_cache_t *cache) { while (record) { @@ -106,7 +106,7 @@ struct VARC hb_array_t coords, hb_transform_t<> transform = HB_TRANSFORM_IDENTITY, hb_codepoint_t parent_gid = HB_CODEPOINT_INVALID, - _hb_scalar_cache_t *parent_cache = nullptr) const; + hb_scalar_cache_t *parent_cache = nullptr) const; bool get_path (hb_font_t *font, diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index 7da14bbc0..5c0533aad 100644 --- a/src/hb-ot-layout-common.hh +++ b/src/hb-ot-layout-common.hh @@ -2540,8 +2540,7 @@ struct SparseVarRegionAxis DEFINE_SIZE_STATIC (8); }; -template -struct _hb_scalar_cache_t +struct hb_scalar_cache_t { private: static constexpr unsigned STATIC_LENGTH = 16; @@ -2550,17 +2549,17 @@ struct _hb_scalar_cache_t static constexpr float DIVISOR = 1.f / MULTIPLIER; public: - _hb_scalar_cache_t () : length (STATIC_LENGTH) { clear (); } + hb_scalar_cache_t () : length (STATIC_LENGTH) { clear (); } - _hb_scalar_cache_t (const _hb_scalar_cache_t&) = delete; - _hb_scalar_cache_t (_hb_scalar_cache_t&&) = delete; - _hb_scalar_cache_t& operator= (const _hb_scalar_cache_t&) = delete; - _hb_scalar_cache_t& operator= (_hb_scalar_cache_t&&) = delete; + hb_scalar_cache_t (const hb_scalar_cache_t&) = delete; + hb_scalar_cache_t (hb_scalar_cache_t&&) = delete; + hb_scalar_cache_t& operator= (const hb_scalar_cache_t&) = delete; + hb_scalar_cache_t& operator= (hb_scalar_cache_t&&) = delete; - static _hb_scalar_cache_t *create (unsigned int count, - _hb_scalar_cache_t *scratch_cache = nullptr) + static hb_scalar_cache_t *create (unsigned int count, + hb_scalar_cache_t *scratch_cache = nullptr) { - if (!count) return (_hb_scalar_cache_t *) &Null(_hb_scalar_cache_t); + if (!count) return (hb_scalar_cache_t *) &Null(hb_scalar_cache_t); if (scratch_cache && count <= scratch_cache->length) { @@ -2568,8 +2567,8 @@ struct _hb_scalar_cache_t return scratch_cache; } - auto *cache = (_hb_scalar_cache_t *) hb_malloc (sizeof (_hb_scalar_cache_t) - sizeof (static_values) + sizeof (static_values[0]) * count); - if (unlikely (!cache)) return (_hb_scalar_cache_t *) &Null(_hb_scalar_cache_t); + auto *cache = (hb_scalar_cache_t *) hb_malloc (sizeof (hb_scalar_cache_t) - sizeof (static_values) + sizeof (static_values[0]) * count); + if (unlikely (!cache)) return (hb_scalar_cache_t *) &Null(hb_scalar_cache_t); cache->length = count; cache->clear (); @@ -2577,10 +2576,10 @@ struct _hb_scalar_cache_t return cache; } - static void destroy (_hb_scalar_cache_t *cache, - _hb_scalar_cache_t *scratch_cache = nullptr) + static void destroy (hb_scalar_cache_t *cache, + hb_scalar_cache_t *scratch_cache = nullptr) { - if (cache != &Null(_hb_scalar_cache_t) && cache != scratch_cache) + if (cache != &Null(hb_scalar_cache_t) && cache != scratch_cache) hb_free (cache); } @@ -2633,15 +2632,11 @@ struct _hb_scalar_cache_t *cached_value = roundf(value * MULTIPLIER); } - using type_t = std::conditional_t, int>; - private: unsigned length; - mutable type_t static_values[STATIC_LENGTH]; + mutable hb_atomic_t static_values[STATIC_LENGTH]; }; -using hb_scalar_cache_t = _hb_scalar_cache_t; - struct VarRegionList { private: @@ -2668,7 +2663,6 @@ struct VarRegionList } public: - template HB_ALWAYS_INLINE float evaluate (unsigned int region_index, const int *coords, unsigned int coord_len, @@ -2827,7 +2821,6 @@ struct SparseVariationRegion : Array16Of struct SparseVarRegionList { - template HB_ALWAYS_INLINE float evaluate (unsigned int region_index, const int *coords, unsigned int coord_len, @@ -2883,7 +2876,6 @@ struct VarData + itemCount * get_row_size (); } - template float _get_delta (unsigned int inner, const int *coords, unsigned int coord_count, const VarRegionList ®ions, @@ -2931,7 +2923,6 @@ struct VarData return delta; } - template HB_ALWAYS_INLINE float get_delta (unsigned int inner, const int *coords, unsigned int coord_count, @@ -3255,7 +3246,6 @@ struct MultiVarData + StructAfter (regionIndices).get_size (); } - template void get_delta (unsigned int inner, const int *coords, unsigned int coord_count, const SparseVarRegionList ®ions, @@ -3298,7 +3288,6 @@ struct ItemVariationStore { friend struct item_variations_t; - template hb_scalar_cache_t *create_cache () const { #ifdef HB_NO_VAR @@ -3307,14 +3296,12 @@ struct ItemVariationStore return hb_scalar_cache_t::create ((this+regions).regionCount); } - template static void destroy_cache (hb_scalar_cache_t *cache) { hb_scalar_cache_t::destroy (cache); } private: - template float get_delta (unsigned int outer, unsigned int inner, const int *coords, unsigned int coord_count, hb_scalar_cache_t *cache = nullptr) const @@ -3333,7 +3320,6 @@ struct ItemVariationStore } public: - template float get_delta (unsigned int index, const int *coords, unsigned int coord_count, hb_scalar_cache_t *cache = nullptr) const @@ -3342,7 +3328,6 @@ struct ItemVariationStore unsigned int inner = index & 0xFFFF; return get_delta (outer, inner, coords, coord_count, cache); } - template float get_delta (unsigned int index, hb_array_t coords, hb_scalar_cache_t *cache = nullptr) const @@ -3553,7 +3538,6 @@ struct ItemVariationStore struct MultiItemVariationStore { - template hb_scalar_cache_t *create_cache (hb_scalar_cache_t *static_cache = nullptr) const { #ifdef HB_NO_VAR @@ -3565,7 +3549,6 @@ struct MultiItemVariationStore return hb_scalar_cache_t::create (count, static_cache); } - template static void destroy_cache (hb_scalar_cache_t *cache, hb_scalar_cache_t *static_cache = nullptr) { @@ -3573,7 +3556,6 @@ struct MultiItemVariationStore } private: - template void get_delta (unsigned int outer, unsigned int inner, const int *coords, unsigned int coord_count, hb_array_t out, @@ -3594,7 +3576,6 @@ struct MultiItemVariationStore } public: - template void get_delta (unsigned int index, const int *coords, unsigned int coord_count, hb_array_t out, @@ -3604,7 +3585,6 @@ struct MultiItemVariationStore unsigned int inner = index & 0xFFFF; get_delta (outer, inner, coords, coord_count, out, cache); } - template void get_delta (unsigned int index, hb_array_t coords, hb_array_t out, @@ -3867,11 +3847,8 @@ struct ItemVarStoreInstancer hb_scalar_cache_t *cache; }; -template struct MultiItemVarStoreInstancer { - using hb_scalar_cache_t = _hb_scalar_cache_t; - MultiItemVarStoreInstancer (const MultiItemVariationStore *varStore, const DeltaSetIndexMap *varIdxMap, hb_array_t coords, @@ -4926,7 +4903,6 @@ struct VariationDevice private: - template float get_delta (hb_font_t *font, const ItemVariationStore &store, hb_scalar_cache_t *store_cache = nullptr) const