Remove SpriteAtlas pointer from Bucket

src/mbgl/renderer/line_bucket.hpp

@@ -30,7 +30,7 @@ class LineBucket : public Bucket {
 
  float getQueryRadius(const RenderLayer&) const override;
 
- style::LineLayoutProperties::PossiblyEvaluated layout;
+ const style::LineLayoutProperties::PossiblyEvaluated layout;
 
  gl::VertexVector<LineLayoutVertex> vertices;
  gl::IndexVector<gl::Triangles> triangles;

src/mbgl/renderer/painter_symbol.cpp

@@ -67,14 +67,13 @@ void Painter::renderSymbol(PaintParameters& parameters,
  auto values = layer.iconPropertyValues(layout);
  auto paintPropertyValues = layer.iconPaintProperties();
 
- SpriteAtlas& atlas = *bucket.spriteAtlas;
  const bool iconScaled = layout.get<IconSize>().constantOr(1.0) != 1.0 ||
- frame.pixelRatio != atlas.getPixelRatio() ||
+ frame.pixelRatio != spriteAtlas->getPixelRatio() ||
  bucket.iconsNeedLinear;
  const bool iconTransformed = values.rotationAlignment == AlignmentType::Map || state.getPitch() != 0;
- atlas.bind(bucket.sdfIcons || state.isChanging() || iconScaled || iconTransformed, context, 0);
+ spriteAtlas->bind(bucket.sdfIcons || state.isChanging() || iconScaled || iconTransformed, context, 0);
 
- const Size texsize = atlas.getSize();
+ const Size texsize = spriteAtlas->getSize();
 
  if (bucket.sdfIcons) {
  if (values.hasHalo) {

src/mbgl/renderer/symbol_bucket.hpp

@@ -70,8 +70,6 @@ class SymbolBucket : public Bucket {
  optional<gl::VertexBuffer<CollisionBoxVertex>> vertexBuffer;
  optional<gl::IndexBuffer<gl::Lines>> indexBuffer;
  } collisionBox;
-
- SpriteAtlas* spriteAtlas = nullptr;
 };
 
 } // namespace mbgl

src/mbgl/tile/geometry_tile.cpp

@@ -126,9 +126,6 @@ void GeometryTile::onPlacement(PlacementResult result) {
  pending = false;
  }
  symbolBuckets = std::move(result.symbolBuckets);
- for (auto& entry : symbolBuckets) {
- dynamic_cast<SymbolBucket*>(entry.second.get())->spriteAtlas = &spriteAtlas;
- }
  collisionTile = std::move(result.collisionTile);
  observer->onTileChanged(*this);
 }