From aba798ddab246faea91f069d31dabaf33a90fc53 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 12 Sep 2025 00:52:40 -0600 Subject: [PATCH] [instancer/varstore] Use heapify() instead of inserts() --- src/hb-ot-var-common.hh | 10 ++++++++-- src/hb-priority-queue.hh | 12 +++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/hb-ot-var-common.hh b/src/hb-ot-var-common.hh index 00a77ba88..7b100c322 100644 --- a/src/hb-ot-var-common.hh +++ b/src/hb-ot-var-common.hh @@ -1894,7 +1894,8 @@ struct item_variations_t /* main algorithm: repeatedly pick 2 best encodings to combine, and combine * them */ - hb_priority_queue_t queue; + using item_t = hb_priority_queue_t::item_t; + hb_vector_t queue_items; unsigned num_todos = encoding_objs.length; for (unsigned i = 0; i < num_todos; i++) { @@ -1902,10 +1903,15 @@ struct item_variations_t { int combining_gain = encoding_objs.arrayZ[i].gain_from_merging (encoding_objs.arrayZ[j], scratch); if (combining_gain > 0) - queue.insert (combined_gain_idx_tuple_t (-combining_gain, i, j), 0); + { + auto item = item_t (combined_gain_idx_tuple_t (-combining_gain, i, j), 0); + queue_items.push (item); + } } } + hb_priority_queue_t queue (std::move (queue_items)); + hb_bit_set_t removed_todo_idxes; while (queue) { diff --git a/src/hb-priority-queue.hh b/src/hb-priority-queue.hh index 274d5df4c..753e86b8c 100644 --- a/src/hb-priority-queue.hh +++ b/src/hb-priority-queue.hh @@ -45,12 +45,22 @@ template struct hb_priority_queue_t { - private: + public: typedef hb_pair_t item_t; + + private: hb_vector_t heap; public: + hb_priority_queue_t () = default; + hb_priority_queue_t (hb_vector_t&& other) : heap (std::move (other)) + { + // Heapify the vector. + for (int i = (heap.length / 2) - 1; i >= 0; i--) + bubble_down (i); + } + void reset () { heap.resize (0); } bool in_error () const { return heap.in_error (); }