1 files changed, 21 insertions, 2 deletions
diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp
index b984c596d3..c607b23c47 100644
--- a/src/mbgl/renderer/layers/render_circle_layer.cpp
+++ b/src/mbgl/renderer/layers/render_circle_layer.cpp
@@ -23,8 +23,11 @@ const style::CircleLayer::Impl& RenderCircleLayer::impl() const {
     return static_cast<const style::CircleLayer::Impl&>(*baseImpl);
 }
 
-std::unique_ptr<Bucket> RenderCircleLayer::createBucket(const BucketParameters& parameters, const std::vector<const RenderLayer*>& layers) const {
-    return std::make_unique<CircleBucket>(parameters, layers);
+std::unique_ptr<Layout>
+RenderCircleLayer::createLayout(const BucketParameters& parameters, const std::vector<const RenderLayer*>& group,
+                                std::unique_ptr<GeometryTileLayer> layer, GlyphDependencies&,
+                                ImageDependencies& imageDependencies) const {
+    return std::make_unique<CircleLayout<CircleBucket>>(parameters, group, std::move(layer), imageDependencies);
 }
 
 void RenderCircleLayer::transition(const TransitionParameters& parameters) {
@@ -133,6 +136,22 @@ GeometryCoordinates projectQueryGeometry(const GeometryCoordinates& queryGeometr
     return projectedGeometry;
 }
 
+style::CirclePaintProperties::PossiblyEvaluated RenderCircleLayer::paintProperties() const {
+    return CirclePaintProperties::PossiblyEvaluated {
+        evaluated.get<style::CircleRadius>(),
+        evaluated.get<style::CircleColor>(),
+        evaluated.get<style::CircleBlur>(),
+        evaluated.get<style::CircleOpacity>(),
+        evaluated.get<style::CircleTranslate>(),
+        evaluated.get<style::CircleTranslateAnchor>(),
+        evaluated.get<style::CirclePitchScale>(),
+        evaluated.get<style::CirclePitchAlignment>(),
+        evaluated.get<style::CircleStrokeWidth>(),
+        evaluated.get<style::CircleStrokeColor>(),
+        evaluated.get<style::CircleStrokeOpacity>()
+    };
+}
+
 bool RenderCircleLayer::queryIntersectsFeature(
         const GeometryCoordinates& queryGeometry,
         const GeometryTileFeature& feature,