diff --git a/src/mbgl/renderer/render_background_layer.cpp b/src/mbgl/renderer/render_background_layer.cpp index adce5206ab3..712ea10aed7 100644 --- a/src/mbgl/renderer/render_background_layer.cpp +++ b/src/mbgl/renderer/render_background_layer.cpp @@ -12,10 +12,6 @@ const style::BackgroundLayer::Impl& RenderBackgroundLayer::impl() const { return static_cast(*baseImpl); } -std::unique_ptr RenderBackgroundLayer::clone() const { - return std::make_unique(*this); -} - std::unique_ptr RenderBackgroundLayer::createBucket(const BucketParameters &, const std::vector &) const { assert(false); diff --git a/src/mbgl/renderer/render_background_layer.hpp b/src/mbgl/renderer/render_background_layer.hpp index 9baf4e7592e..829ae7732fd 100644 --- a/src/mbgl/renderer/render_background_layer.hpp +++ b/src/mbgl/renderer/render_background_layer.hpp @@ -11,8 +11,6 @@ class RenderBackgroundLayer: public RenderLayer { RenderBackgroundLayer(Immutable); ~RenderBackgroundLayer() final = default; - std::unique_ptr clone() const override; - void cascade(const CascadeParameters&) override; void evaluate(const PropertyEvaluationParameters&) override; bool hasTransition() const override; diff --git a/src/mbgl/renderer/render_circle_layer.cpp b/src/mbgl/renderer/render_circle_layer.cpp index 59cc9e11a3c..3c9a517dc99 100644 --- a/src/mbgl/renderer/render_circle_layer.cpp +++ b/src/mbgl/renderer/render_circle_layer.cpp @@ -15,10 +15,6 @@ const style::CircleLayer::Impl& RenderCircleLayer::impl() const { return static_cast(*baseImpl); } -std::unique_ptr RenderCircleLayer::clone() const { - return std::make_unique(*this); -} - std::unique_ptr RenderCircleLayer::createBucket(const BucketParameters& parameters, const std::vector& layers) const { return std::make_unique(parameters, layers); } diff --git a/src/mbgl/renderer/render_circle_layer.hpp b/src/mbgl/renderer/render_circle_layer.hpp index bb3ff8d0ad6..fc88139d122 100644 --- a/src/mbgl/renderer/render_circle_layer.hpp +++ b/src/mbgl/renderer/render_circle_layer.hpp @@ -11,8 +11,6 @@ class RenderCircleLayer: public RenderLayer { RenderCircleLayer(Immutable); ~RenderCircleLayer() final = default; - std::unique_ptr clone() const override; - void cascade(const CascadeParameters&) override; void evaluate(const PropertyEvaluationParameters&) override; bool hasTransition() const override; diff --git a/src/mbgl/renderer/render_custom_layer.cpp b/src/mbgl/renderer/render_custom_layer.cpp index a283ed30f9a..5bdae033541 100644 --- a/src/mbgl/renderer/render_custom_layer.cpp +++ b/src/mbgl/renderer/render_custom_layer.cpp @@ -12,10 +12,6 @@ const style::CustomLayer::Impl& RenderCustomLayer::impl() const { return static_cast(*baseImpl); } -std::unique_ptr RenderCustomLayer::clone() const { - return std::make_unique(*this); -} - void RenderCustomLayer::evaluate(const PropertyEvaluationParameters&) { passes = RenderPass::Translucent; } diff --git a/src/mbgl/renderer/render_custom_layer.hpp b/src/mbgl/renderer/render_custom_layer.hpp index 9689bd1bff9..2a64e029a46 100644 --- a/src/mbgl/renderer/render_custom_layer.hpp +++ b/src/mbgl/renderer/render_custom_layer.hpp @@ -10,8 +10,6 @@ class RenderCustomLayer: public RenderLayer { RenderCustomLayer(Immutable); ~RenderCustomLayer() final = default; - std::unique_ptr clone() const override; - void cascade(const CascadeParameters&) final {} void evaluate(const PropertyEvaluationParameters&) override; bool hasTransition() const override; diff --git a/src/mbgl/renderer/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/render_fill_extrusion_layer.cpp index 8dc6e93a9eb..3142384fc6b 100644 --- a/src/mbgl/renderer/render_fill_extrusion_layer.cpp +++ b/src/mbgl/renderer/render_fill_extrusion_layer.cpp @@ -15,10 +15,6 @@ const style::FillExtrusionLayer::Impl& RenderFillExtrusionLayer::impl() const { return static_cast(*baseImpl); } -std::unique_ptr RenderFillExtrusionLayer::clone() const { - return std::make_unique(*this); -} - std::unique_ptr RenderFillExtrusionLayer::createBucket(const BucketParameters& parameters, const std::vector& layers) const { return std::make_unique(parameters, layers); } diff --git a/src/mbgl/renderer/render_fill_extrusion_layer.hpp b/src/mbgl/renderer/render_fill_extrusion_layer.hpp index 2bfbc296c1e..ef6858a680e 100644 --- a/src/mbgl/renderer/render_fill_extrusion_layer.hpp +++ b/src/mbgl/renderer/render_fill_extrusion_layer.hpp @@ -11,8 +11,6 @@ class RenderFillExtrusionLayer: public RenderLayer { RenderFillExtrusionLayer(Immutable); ~RenderFillExtrusionLayer() final = default; - std::unique_ptr clone() const override; - void cascade(const CascadeParameters&) override; void evaluate(const PropertyEvaluationParameters&) override; bool hasTransition() const override; diff --git a/src/mbgl/renderer/render_fill_layer.cpp b/src/mbgl/renderer/render_fill_layer.cpp index 77f84c503a6..67f9bbe2218 100644 --- a/src/mbgl/renderer/render_fill_layer.cpp +++ b/src/mbgl/renderer/render_fill_layer.cpp @@ -15,10 +15,6 @@ const style::FillLayer::Impl& RenderFillLayer::impl() const { return static_cast(*baseImpl); } -std::unique_ptr RenderFillLayer::clone() const { - return std::make_unique(*this); -} - std::unique_ptr RenderFillLayer::createBucket(const BucketParameters& parameters, const std::vector& layers) const { return std::make_unique(parameters, layers); } diff --git a/src/mbgl/renderer/render_fill_layer.hpp b/src/mbgl/renderer/render_fill_layer.hpp index 7e23a61a007..7402094a1c2 100644 --- a/src/mbgl/renderer/render_fill_layer.hpp +++ b/src/mbgl/renderer/render_fill_layer.hpp @@ -11,8 +11,6 @@ class RenderFillLayer: public RenderLayer { RenderFillLayer(Immutable); ~RenderFillLayer() final = default; - std::unique_ptr clone() const override; - void cascade(const CascadeParameters&) override; void evaluate(const PropertyEvaluationParameters&) override; bool hasTransition() const override; diff --git a/src/mbgl/renderer/render_layer.hpp b/src/mbgl/renderer/render_layer.hpp index a8774055642..f1999a72571 100644 --- a/src/mbgl/renderer/render_layer.hpp +++ b/src/mbgl/renderer/render_layer.hpp @@ -24,9 +24,6 @@ class RenderLayer { public: virtual ~RenderLayer() = default; - // Create an identical copy of this layer. - virtual std::unique_ptr clone() const = 0; - // Partially evaluate paint properties based on a set of classes. virtual void cascade(const CascadeParameters&) = 0; diff --git a/src/mbgl/renderer/render_line_layer.cpp b/src/mbgl/renderer/render_line_layer.cpp index 6573118c3bf..2c1b5a686dd 100644 --- a/src/mbgl/renderer/render_line_layer.cpp +++ b/src/mbgl/renderer/render_line_layer.cpp @@ -15,10 +15,6 @@ const style::LineLayer::Impl& RenderLineLayer::impl() const { return static_cast(*baseImpl); } -std::unique_ptr RenderLineLayer::clone() const { - return std::make_unique(*this); -} - std::unique_ptr RenderLineLayer::createBucket(const BucketParameters& parameters, const std::vector& layers) const { return std::make_unique(parameters, layers, impl().layout); } diff --git a/src/mbgl/renderer/render_line_layer.hpp b/src/mbgl/renderer/render_line_layer.hpp index dce4d07f186..ddb2608fff3 100644 --- a/src/mbgl/renderer/render_line_layer.hpp +++ b/src/mbgl/renderer/render_line_layer.hpp @@ -11,8 +11,6 @@ class RenderLineLayer: public RenderLayer { RenderLineLayer(Immutable); ~RenderLineLayer() final = default; - std::unique_ptr clone() const override; - void cascade(const CascadeParameters&) override; void evaluate(const PropertyEvaluationParameters&) override; bool hasTransition() const override; diff --git a/src/mbgl/renderer/render_raster_layer.cpp b/src/mbgl/renderer/render_raster_layer.cpp index 2e79a785bc7..04a52325e99 100644 --- a/src/mbgl/renderer/render_raster_layer.cpp +++ b/src/mbgl/renderer/render_raster_layer.cpp @@ -12,10 +12,6 @@ const style::RasterLayer::Impl& RenderRasterLayer::impl() const { return static_cast(*baseImpl); } -std::unique_ptr RenderRasterLayer::clone() const { - return std::make_unique(*this); -} - std::unique_ptr RenderRasterLayer::createBucket(const BucketParameters&, const std::vector&) const { assert(false); return nullptr; diff --git a/src/mbgl/renderer/render_raster_layer.hpp b/src/mbgl/renderer/render_raster_layer.hpp index f51d042d5f0..c822262e915 100644 --- a/src/mbgl/renderer/render_raster_layer.hpp +++ b/src/mbgl/renderer/render_raster_layer.hpp @@ -11,8 +11,6 @@ class RenderRasterLayer: public RenderLayer { RenderRasterLayer(Immutable); ~RenderRasterLayer() final = default; - std::unique_ptr clone() const override; - void cascade(const CascadeParameters&) override; void evaluate(const PropertyEvaluationParameters&) override; bool hasTransition() const override; diff --git a/src/mbgl/renderer/render_symbol_layer.cpp b/src/mbgl/renderer/render_symbol_layer.cpp index 7ea6190cb19..5e07b84481d 100644 --- a/src/mbgl/renderer/render_symbol_layer.cpp +++ b/src/mbgl/renderer/render_symbol_layer.cpp @@ -16,10 +16,6 @@ const style::SymbolLayer::Impl& RenderSymbolLayer::impl() const { return static_cast(*baseImpl); } -std::unique_ptr RenderSymbolLayer::clone() const { - return std::make_unique(*this); -} - std::unique_ptr RenderSymbolLayer::createBucket(const BucketParameters&, const std::vector&) const { assert(false); // Should be calling createLayout() instead. return nullptr; diff --git a/src/mbgl/renderer/render_symbol_layer.hpp b/src/mbgl/renderer/render_symbol_layer.hpp index 553deb82599..07b4e96125a 100644 --- a/src/mbgl/renderer/render_symbol_layer.hpp +++ b/src/mbgl/renderer/render_symbol_layer.hpp @@ -64,8 +64,6 @@ class RenderSymbolLayer: public RenderLayer { RenderSymbolLayer(Immutable); ~RenderSymbolLayer() final = default; - std::unique_ptr clone() const override; - void cascade(const CascadeParameters&) override; void evaluate(const PropertyEvaluationParameters&) override; bool hasTransition() const override;