diff options
Diffstat (limited to 'src/mbgl/renderer/layers')
10 files changed, 10 insertions, 10 deletions
diff --git a/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp index 3e510ef352..d7bf0dc6bd 100644 --- a/src/mbgl/renderer/layers/render_background_layer.cpp +++ b/src/mbgl/renderer/layers/render_background_layer.cpp @@ -14,7 +14,7 @@ namespace mbgl { using namespace style; RenderBackgroundLayer::RenderBackgroundLayer(Immutable<style::BackgroundLayer::Impl> _impl) - : RenderLayer(style::LayerType::Background, _impl), + : RenderLayer(std::move(_impl)), unevaluated(impl().paint.untransitioned()) { } diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp index 46db06416d..b984c596d3 100644 --- a/src/mbgl/renderer/layers/render_circle_layer.cpp +++ b/src/mbgl/renderer/layers/render_circle_layer.cpp @@ -15,7 +15,7 @@ namespace mbgl { using namespace style; RenderCircleLayer::RenderCircleLayer(Immutable<style::CircleLayer::Impl> _impl) - : RenderLayer(style::LayerType::Circle, _impl), + : RenderLayer(std::move(_impl)), unevaluated(impl().paint.untransitioned()) { } diff --git a/src/mbgl/renderer/layers/render_custom_layer.cpp b/src/mbgl/renderer/layers/render_custom_layer.cpp index e80ceda6c7..9e65830faf 100644 --- a/src/mbgl/renderer/layers/render_custom_layer.cpp +++ b/src/mbgl/renderer/layers/render_custom_layer.cpp @@ -13,7 +13,7 @@ namespace mbgl { using namespace style; RenderCustomLayer::RenderCustomLayer(Immutable<style::CustomLayer::Impl> _impl) - : RenderLayer(LayerType::Custom, _impl), host(_impl->host) { + : RenderLayer(std::move(_impl)), host(impl().host) { assert(BackendScope::exists()); host->initialize(); } diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp index 8f1b961d1a..91d58bf8d6 100644 --- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp @@ -19,7 +19,7 @@ namespace mbgl { using namespace style; RenderFillExtrusionLayer::RenderFillExtrusionLayer(Immutable<style::FillExtrusionLayer::Impl> _impl) - : RenderLayer(style::LayerType::FillExtrusion, _impl), + : RenderLayer(std::move(_impl)), unevaluated(impl().paint.untransitioned()) { } diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index 83be3ccd57..391c2d5b0f 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -17,7 +17,7 @@ namespace mbgl { using namespace style; RenderFillLayer::RenderFillLayer(Immutable<style::FillLayer::Impl> _impl) - : RenderLayer(style::LayerType::Fill, _impl), + : RenderLayer(std::move(_impl)), unevaluated(impl().paint.untransitioned()) { } diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.cpp b/src/mbgl/renderer/layers/render_heatmap_layer.cpp index 4e5e890358..1842cdac93 100644 --- a/src/mbgl/renderer/layers/render_heatmap_layer.cpp +++ b/src/mbgl/renderer/layers/render_heatmap_layer.cpp @@ -17,7 +17,7 @@ namespace mbgl { using namespace style; RenderHeatmapLayer::RenderHeatmapLayer(Immutable<style::HeatmapLayer::Impl> _impl) - : RenderLayer(style::LayerType::Heatmap, _impl), + : RenderLayer(std::move(_impl)), unevaluated(impl().paint.untransitioned()), colorRamp({256, 1}) { } diff --git a/src/mbgl/renderer/layers/render_hillshade_layer.cpp b/src/mbgl/renderer/layers/render_hillshade_layer.cpp index 835cb3f9f9..ba7e782f16 100644 --- a/src/mbgl/renderer/layers/render_hillshade_layer.cpp +++ b/src/mbgl/renderer/layers/render_hillshade_layer.cpp @@ -16,7 +16,7 @@ namespace mbgl { using namespace style; RenderHillshadeLayer::RenderHillshadeLayer(Immutable<style::HillshadeLayer::Impl> _impl) - : RenderLayer(style::LayerType::Hillshade, _impl), + : RenderLayer(std::move(_impl)), unevaluated(impl().paint.untransitioned()) { } diff --git a/src/mbgl/renderer/layers/render_line_layer.cpp b/src/mbgl/renderer/layers/render_line_layer.cpp index 94081b5f09..fcdbc0b47a 100644 --- a/src/mbgl/renderer/layers/render_line_layer.cpp +++ b/src/mbgl/renderer/layers/render_line_layer.cpp @@ -18,7 +18,7 @@ namespace mbgl { using namespace style; RenderLineLayer::RenderLineLayer(Immutable<style::LineLayer::Impl> _impl) - : RenderLayer(style::LayerType::Line, _impl), + : RenderLayer(std::move(_impl)), unevaluated(impl().paint.untransitioned()), colorRamp({256, 1}) { } diff --git a/src/mbgl/renderer/layers/render_raster_layer.cpp b/src/mbgl/renderer/layers/render_raster_layer.cpp index 8e0651b65b..e0a7e427ad 100644 --- a/src/mbgl/renderer/layers/render_raster_layer.cpp +++ b/src/mbgl/renderer/layers/render_raster_layer.cpp @@ -14,7 +14,7 @@ namespace mbgl { using namespace style; RenderRasterLayer::RenderRasterLayer(Immutable<style::RasterLayer::Impl> _impl) - : RenderLayer(style::LayerType::Raster, _impl), + : RenderLayer(std::move(_impl)), unevaluated(impl().paint.untransitioned()) { } diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index 2b3a7195c5..11ffd74b10 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -23,7 +23,7 @@ namespace mbgl { using namespace style; RenderSymbolLayer::RenderSymbolLayer(Immutable<style::SymbolLayer::Impl> _impl) - : RenderLayer(style::LayerType::Symbol, _impl), + : RenderLayer(std::move(_impl)), unevaluated(impl().paint.untransitioned()) { } |