5 files changed, 14 insertions, 2 deletions
diff --git a/src/mbgl/renderer/buckets/circle_bucket.cpp b/src/mbgl/renderer/buckets/circle_bucket.cpp
index 820cf9f525..7e08b3c96b 100644
--- a/src/mbgl/renderer/buckets/circle_bucket.cpp
+++ b/src/mbgl/renderer/buckets/circle_bucket.cpp
@@ -18,7 +18,7 @@ CircleBucket::CircleBucket(const BucketParameters& parameters, const std::vector
             std::piecewise_construct,
             std::forward_as_tuple(layer->getID()),
             std::forward_as_tuple(
-                layer->as<RenderCircleLayer>()->evaluated,
+                toRenderCircleLayer(layer)->evaluated,
                 parameters.tileID.overscaledZ));
     }
 }
diff --git a/src/mbgl/renderer/buckets/heatmap_bucket.cpp b/src/mbgl/renderer/buckets/heatmap_bucket.cpp
index 46d5f31599..1ed6064c34 100644
--- a/src/mbgl/renderer/buckets/heatmap_bucket.cpp
+++ b/src/mbgl/renderer/buckets/heatmap_bucket.cpp
@@ -18,7 +18,7 @@ HeatmapBucket::HeatmapBucket(const BucketParameters& parameters, const std::vect
             std::piecewise_construct,
             std::forward_as_tuple(layer->getID()),
             std::forward_as_tuple(
-                layer->as<RenderHeatmapLayer>()->evaluated,
+                toRenderHeatmapLayer(layer)->evaluated,
                 parameters.tileID.overscaledZ));
     }
 }
diff --git a/src/mbgl/renderer/layers/render_circle_layer.hpp b/src/mbgl/renderer/layers/render_circle_layer.hpp
index 53353fcdcb..678aeb102f 100644
--- a/src/mbgl/renderer/layers/render_circle_layer.hpp
+++ b/src/mbgl/renderer/layers/render_circle_layer.hpp
@@ -39,4 +39,8 @@ inline bool RenderLayer::is<RenderCircleLayer>() const {
     return type == style::LayerType::Circle;
 }
 
+inline const RenderCircleLayer* toRenderCircleLayer(const RenderLayer* layer) {
+    return static_cast<const RenderCircleLayer*>(layer);
+}
+
 } // namespace mbgl
diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.hpp b/src/mbgl/renderer/layers/render_heatmap_layer.hpp
index 9aca8bdc93..c2d2dcaa3b 100644
--- a/src/mbgl/renderer/layers/render_heatmap_layer.hpp
+++ b/src/mbgl/renderer/layers/render_heatmap_layer.hpp
@@ -49,4 +49,8 @@ inline bool RenderLayer::is<RenderHeatmapLayer>() const {
     return type == style::LayerType::Heatmap;
 }
 
+inline const RenderHeatmapLayer* toRenderHeatmapLayer(const RenderLayer* layer) {
+    return static_cast<const RenderHeatmapLayer*>(layer);
+}
+
 } // namespace mbgl
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.hpp b/src/mbgl/renderer/layers/render_symbol_layer.hpp
index bd43324712..7c52467e56 100644
--- a/src/mbgl/renderer/layers/render_symbol_layer.hpp
+++ b/src/mbgl/renderer/layers/render_symbol_layer.hpp
@@ -99,4 +99,8 @@ inline bool RenderLayer::is<RenderSymbolLayer>() const {
     return type == style::LayerType::Symbol;
 }
 
+inline const RenderSymbolLayer* toRenderSymbolLayer(const RenderLayer* layer) {
+    return static_cast<const RenderSymbolLayer*>(layer);
+}
+
 } // namespace mbgl