make addGlyphsToAtlas static method of SymbolBucket + add addGlyphs method to minimise number of mutex locking

2 files changed, 6 insertions, 2 deletions

diff --git a/include/mbgl/geometry/glyph_atlas.hpp b/include/mbgl/geometry/glyph_atlas.hpp
index 5b09cbcd6d..639c6cc511 100644
--- a/include/mbgl/geometry/glyph_atlas.hpp
+++ b/include/mbgl/geometry/glyph_atlas.hpp
@@ -24,6 +24,8 @@ private:
         std::set<uint64_t> ids;
     };
 
+    Rect<uint16_t> addGlyph_impl(uint64_t tile_id, const std::string& face_name,
+                                 const SDFGlyph& glyph);
 public:
     GlyphAtlas(uint16_t width, uint16_t height);
     ~GlyphAtlas();
@@ -31,6 +33,8 @@ public:
 
     Rect<uint16_t> addGlyph(uint64_t tile_id, const std::string& face_name,
                             const SDFGlyph& glyph);
+    void addGlyphs(uint64_t tileid, std::u32string const& text, std::string const& stackname,
+                   FontStack const& fontStack, GlyphPositions & face);
     void removeGlyphs(uint64_t tile_id);
     void bind();
 
diff --git a/include/mbgl/renderer/symbol_bucket.hpp b/include/mbgl/renderer/symbol_bucket.hpp
index 42682401ef..9a5da1d012 100644
--- a/include/mbgl/renderer/symbol_bucket.hpp
+++ b/include/mbgl/renderer/symbol_bucket.hpp
@@ -86,8 +86,8 @@ private:
     void addSymbols(Buffer &buffer, const PlacedGlyphs &symbols, float scale, PlacementRange placementRange);
 
     // Adds glyphs to the glyph atlas so that they have a left/top/width/height coordinates associated to them that we can use for writing to a buffer.
-    void addGlyphsToAtlas(uint64_t tileid, const std::string stackname, const std::u32string &string,
-                  const FontStack &fontStack, GlyphAtlas &glyphAtlas, GlyphPositions &face);
+    static void addGlyphsToAtlas(uint64_t tileid, const std::string stackname, const std::u32string &string,
+                          const FontStack &fontStack, GlyphAtlas &glyphAtlas, GlyphPositions &face);
 
 public:
     const StyleBucketSymbol &properties;