From 5cdf838a387cae446dba500ac49a1c5524bf7949 Mon Sep 17 00:00:00 2001
From: Chris Loer <chris.loer@gmail.com>
Date: Fri, 31 Mar 2017 14:53:18 -0700
Subject: [core] De-mutex GlyphAtlas and SpriteAtlas  - Expose glyph and icon
 information to workers via message interface.  - Glyph/SpriteAtlas track
 which tiles have outstanding requests     and send messages to them when
 glyphs/icons become available.  - Remove obsolete
 "updateSymbolDependentTiles" pathway  - Symbol preparation for a tile now
 depends on all glyphs becoming     available before it can start.  - Start
 tracking individual icons needed for a tile, although we don't     do
 anything with the information yet.  - Introduce typedef for GlyphID

---
 src/mbgl/style/layers/symbol_layer_impl.hpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/mbgl/style/layers/symbol_layer_impl.hpp')

diff --git a/src/mbgl/style/layers/symbol_layer_impl.hpp b/src/mbgl/style/layers/symbol_layer_impl.hpp
index 0c4b74e833..db20989f01 100644
--- a/src/mbgl/style/layers/symbol_layer_impl.hpp
+++ b/src/mbgl/style/layers/symbol_layer_impl.hpp
@@ -1,13 +1,14 @@
 #pragma once
 
+#include <mbgl/text/glyph.hpp>
 #include <mbgl/util/variant.hpp>
+#include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/style/layer_impl.hpp>
 #include <mbgl/style/layers/symbol_layer.hpp>
 #include <mbgl/style/layers/symbol_layer_properties.hpp>
 
 namespace mbgl {
 
-class SpriteAtlas;
 class SymbolLayout;
 
 namespace style {
@@ -67,7 +68,7 @@ public:
 
     std::unique_ptr<Bucket> createBucket(const BucketParameters&, const std::vector<const Layer*>&) const override;
     std::unique_ptr<SymbolLayout> createLayout(const BucketParameters&, const std::vector<const Layer*>&,
-                                               const GeometryTileLayer&) const;
+                                               const GeometryTileLayer&, GlyphDependencies&, IconDependencyMap&) const;
 
     IconPaintProperties::Evaluated iconPaintProperties() const;
     TextPaintProperties::Evaluated textPaintProperties() const;
-- 
cgit v1.2.1