[core] Tweak handling of annotation special case SpriteAtlas

* Simplify SymbolLayout; it never needs to care about more than one SpriteAtlas.
* Move the reference from SymbolLayer::Impl to SymbolBucket. This is a prerequisite for making layer Impls immutable.

1 files changed, 1 insertions, 4 deletions

diff --git a/src/mbgl/layout/symbol_layout.hpp b/src/mbgl/layout/symbol_layout.hpp
index 55e4098451..7d19aba671 100644
--- a/src/mbgl/layout/symbol_layout.hpp
+++ b/src/mbgl/layout/symbol_layout.hpp
@@ -31,10 +31,9 @@ public:
                  const std::vector<const RenderLayer*>&,
                  const GeometryTileLayer&,
                  IconDependencies&,
-                 uintptr_t,
                  GlyphDependencies&);
 
-    void prepare(const GlyphPositionMap& glyphs, const IconAtlasMap& icons);
+    void prepare(const GlyphPositionMap& glyphs, const IconMap& icons);
 
     std::unique_ptr<SymbolBucket> place(CollisionTile&);
 
@@ -81,8 +80,6 @@ private:
     const MapMode mode;
 
     style::SymbolLayoutProperties::PossiblyEvaluated layout;
-    
-    uintptr_t spriteAtlasMapIndex; // Actually a pointer to the SpriteAtlas for this symbol's layer, but don't use it from worker threads!
 
     const uint32_t tileSize;
     const float tilePixelRatio;