From 54e26b20e7d64e1c4497ef3c411230fe708851b6 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 8 May 2017 16:54:01 -0700 Subject: [core] Remove unused RenderLayer::clone --- src/mbgl/renderer/render_background_layer.cpp | 4 ---- src/mbgl/renderer/render_background_layer.hpp | 2 -- src/mbgl/renderer/render_circle_layer.cpp | 4 ---- src/mbgl/renderer/render_circle_layer.hpp | 2 -- src/mbgl/renderer/render_custom_layer.cpp | 4 ---- src/mbgl/renderer/render_custom_layer.hpp | 2 -- src/mbgl/renderer/render_fill_extrusion_layer.cpp | 4 ---- src/mbgl/renderer/render_fill_extrusion_layer.hpp | 2 -- src/mbgl/renderer/render_fill_layer.cpp | 4 ---- src/mbgl/renderer/render_fill_layer.hpp | 2 -- src/mbgl/renderer/render_layer.hpp | 3 --- src/mbgl/renderer/render_line_layer.cpp | 4 ---- src/mbgl/renderer/render_line_layer.hpp | 2 -- src/mbgl/renderer/render_raster_layer.cpp | 4 ---- src/mbgl/renderer/render_raster_layer.hpp | 2 -- src/mbgl/renderer/render_symbol_layer.cpp | 4 ---- src/mbgl/renderer/render_symbol_layer.hpp | 2 -- 17 files changed, 51 deletions(-) diff --git a/src/mbgl/renderer/render_background_layer.cpp b/src/mbgl/renderer/render_background_layer.cpp index f2e9c0cbaf..a0c3fe81b2 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 6a98ff330c..c2ac44af8b 100644 --- a/src/mbgl/renderer/render_background_layer.hpp +++ b/src/mbgl/renderer/render_background_layer.hpp @@ -11,8 +11,6 @@ public: 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 fb179082c9..5afe7682f2 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 7c411e80aa..d059db9343 100644 --- a/src/mbgl/renderer/render_circle_layer.hpp +++ b/src/mbgl/renderer/render_circle_layer.hpp @@ -11,8 +11,6 @@ public: 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 0f22bc8780..8cedda2417 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 9b16928a58..64cd02ac7b 100644 --- a/src/mbgl/renderer/render_custom_layer.hpp +++ b/src/mbgl/renderer/render_custom_layer.hpp @@ -10,8 +10,6 @@ public: 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 8dc6e93a9e..3142384fc6 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 2bfbc296c1..ef6858a680 100644 --- a/src/mbgl/renderer/render_fill_extrusion_layer.hpp +++ b/src/mbgl/renderer/render_fill_extrusion_layer.hpp @@ -11,8 +11,6 @@ public: 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 0de22b3ca8..8bed153b41 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 7e23a61a00..7402094a1c 100644 --- a/src/mbgl/renderer/render_fill_layer.hpp +++ b/src/mbgl/renderer/render_fill_layer.hpp @@ -11,8 +11,6 @@ public: 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 a877405564..f1999a7257 100644 --- a/src/mbgl/renderer/render_layer.hpp +++ b/src/mbgl/renderer/render_layer.hpp @@ -24,9 +24,6 @@ protected: 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 6573118c3b..2c1b5a686d 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 dce4d07f18..ddb2608fff 100644 --- a/src/mbgl/renderer/render_line_layer.hpp +++ b/src/mbgl/renderer/render_line_layer.hpp @@ -11,8 +11,6 @@ public: 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 2e79a785bc..04a52325e9 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 f51d042d5f..c822262e91 100644 --- a/src/mbgl/renderer/render_raster_layer.hpp +++ b/src/mbgl/renderer/render_raster_layer.hpp @@ -11,8 +11,6 @@ public: 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 7ea6190cb1..5e07b84481 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 553deb8259..07b4e96125 100644 --- a/src/mbgl/renderer/render_symbol_layer.hpp +++ b/src/mbgl/renderer/render_symbol_layer.hpp @@ -64,8 +64,6 @@ public: 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; -- cgit v1.2.1