diff options
author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-03-20 12:38:09 +0200 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-03-23 12:09:09 +0200 |
commit | d15b9c1f9c1afa29175ba2e398adc680e66147e6 (patch) | |
tree | 6bf426ae77d7386a6bbdee30444974bbc5dd76d0 /src/mbgl/renderer | |
parent | 37802eec36aae3cb84c7f73a48652d9959489243 (diff) | |
download | qtlocation-mapboxgl-d15b9c1f9c1afa29175ba2e398adc680e66147e6.tar.gz |
[core] Fix performance-unnecessary-value-param errors
As reported by clang-tidy-8.
Diffstat (limited to 'src/mbgl/renderer')
-rw-r--r-- | src/mbgl/renderer/buckets/fill_bucket.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/fill_bucket.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/line_bucket.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/line_bucket.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/render_orchestrator.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/render_orchestrator.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/render_source.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/render_source.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/renderer.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/renderer_impl.cpp | 14 | ||||
-rw-r--r-- | src/mbgl/renderer/renderer_impl.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/sources/render_geojson_source.cpp | 3 |
14 files changed, 21 insertions, 27 deletions
diff --git a/src/mbgl/renderer/buckets/fill_bucket.cpp b/src/mbgl/renderer/buckets/fill_bucket.cpp index f42dc59579..4257d5ca6e 100644 --- a/src/mbgl/renderer/buckets/fill_bucket.cpp +++ b/src/mbgl/renderer/buckets/fill_bucket.cpp @@ -27,11 +27,10 @@ using namespace style; struct GeometryTooLongException : std::exception {}; -FillBucket::FillBucket(const FillBucket::PossiblyEvaluatedLayoutProperties, +FillBucket::FillBucket(const FillBucket::PossiblyEvaluatedLayoutProperties&, const std::map<std::string, Immutable<style::LayerProperties>>& layerPaintProperties, const float zoom, const uint32_t) { - for (const auto& pair : layerPaintProperties) { paintPropertyBinders.emplace( std::piecewise_construct, diff --git a/src/mbgl/renderer/buckets/fill_bucket.hpp b/src/mbgl/renderer/buckets/fill_bucket.hpp index 4de97141a7..baa605a299 100644 --- a/src/mbgl/renderer/buckets/fill_bucket.hpp +++ b/src/mbgl/renderer/buckets/fill_bucket.hpp @@ -20,7 +20,7 @@ public: ~FillBucket() override; using PossiblyEvaluatedLayoutProperties = style::FillLayoutProperties::PossiblyEvaluated; - FillBucket(const PossiblyEvaluatedLayoutProperties layout, + FillBucket(const PossiblyEvaluatedLayoutProperties& layout, const std::map<std::string, Immutable<style::LayerProperties>>& layerPaintProperties, const float zoom, const uint32_t overscaling); diff --git a/src/mbgl/renderer/buckets/line_bucket.cpp b/src/mbgl/renderer/buckets/line_bucket.cpp index 55593aaa66..809d8df6d3 100644 --- a/src/mbgl/renderer/buckets/line_bucket.cpp +++ b/src/mbgl/renderer/buckets/line_bucket.cpp @@ -10,7 +10,7 @@ namespace mbgl { using namespace style; -LineBucket::LineBucket(const LineBucket::PossiblyEvaluatedLayoutProperties layout_, +LineBucket::LineBucket(const LineBucket::PossiblyEvaluatedLayoutProperties& layout_, const std::map<std::string, Immutable<LayerProperties>>& layerPaintProperties, const float zoom_, const uint32_t overscaling_) diff --git a/src/mbgl/renderer/buckets/line_bucket.hpp b/src/mbgl/renderer/buckets/line_bucket.hpp index 111c16b348..5b6a65440e 100644 --- a/src/mbgl/renderer/buckets/line_bucket.hpp +++ b/src/mbgl/renderer/buckets/line_bucket.hpp @@ -19,7 +19,7 @@ class LineBucket final : public Bucket { public: using PossiblyEvaluatedLayoutProperties = style::LineLayoutProperties::PossiblyEvaluated; - LineBucket(const PossiblyEvaluatedLayoutProperties layout, + LineBucket(const PossiblyEvaluatedLayoutProperties& layout, const std::map<std::string, Immutable<style::LayerProperties>>& layerPaintProperties, const float zoom, const uint32_t overscaling); diff --git a/src/mbgl/renderer/buckets/symbol_bucket.cpp b/src/mbgl/renderer/buckets/symbol_bucket.cpp index de32d5ea49..234e81a9fd 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.cpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.cpp @@ -21,7 +21,7 @@ SymbolBucket::SymbolBucket(Immutable<style::SymbolLayoutProperties::PossiblyEval float zoom, bool iconsNeedLinear_, bool sortFeaturesByY_, - const std::string bucketName_, + const std::string& bucketName_, const std::vector<SymbolInstance>&& symbolInstances_, const std::vector<SortKeyRange>&& sortKeyRanges_, float tilePixelRatio_, diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp index 752f92e889..fa845a589a 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.hpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp @@ -72,7 +72,7 @@ public: float zoom, bool iconsNeedLinear, bool sortFeaturesByY, - const std::string bucketLeaderID, + const std::string& bucketLeaderID, const std::vector<SymbolInstance>&&, const std::vector<SortKeyRange>&&, const float tilePixelRatio, diff --git a/src/mbgl/renderer/render_orchestrator.cpp b/src/mbgl/renderer/render_orchestrator.cpp index 8acadd04b9..bf14813492 100644 --- a/src/mbgl/renderer/render_orchestrator.cpp +++ b/src/mbgl/renderer/render_orchestrator.cpp @@ -103,9 +103,9 @@ public: } // namespace -RenderOrchestrator::RenderOrchestrator(bool backgroundLayerAsColor_, optional<std::string> localFontFamily_) +RenderOrchestrator::RenderOrchestrator(bool backgroundLayerAsColor_, const optional<std::string>& localFontFamily_) : observer(&nullObserver()), - glyphManager(std::make_unique<GlyphManager>(std::make_unique<LocalGlyphRasterizer>(std::move(localFontFamily_)))), + glyphManager(std::make_unique<GlyphManager>(std::make_unique<LocalGlyphRasterizer>(localFontFamily_))), imageManager(std::make_unique<ImageManager>()), lineAtlas(std::make_unique<LineAtlas>()), patternAtlas(std::make_unique<PatternAtlas>()), diff --git a/src/mbgl/renderer/render_orchestrator.hpp b/src/mbgl/renderer/render_orchestrator.hpp index 7c1abfe1f4..a8a6d04901 100644 --- a/src/mbgl/renderer/render_orchestrator.hpp +++ b/src/mbgl/renderer/render_orchestrator.hpp @@ -41,9 +41,7 @@ class RenderOrchestrator final : public GlyphManagerObserver, public ImageManagerObserver, public RenderSourceObserver { public: - RenderOrchestrator( - bool backgroundLayerAsColor_, - optional<std::string> localFontFamily_); + RenderOrchestrator(bool backgroundLayerAsColor_, const optional<std::string>& localFontFamily_); ~RenderOrchestrator() override; void markContextLost() { diff --git a/src/mbgl/renderer/render_source.cpp b/src/mbgl/renderer/render_source.cpp index 7b47602cd1..f39d3089d7 100644 --- a/src/mbgl/renderer/render_source.cpp +++ b/src/mbgl/renderer/render_source.cpp @@ -18,7 +18,7 @@ namespace mbgl { using namespace style; -std::unique_ptr<RenderSource> RenderSource::create(Immutable<Source::Impl> impl) { +std::unique_ptr<RenderSource> RenderSource::create(const Immutable<Source::Impl>& impl) { switch (impl->type) { case SourceType::Vector: return std::make_unique<RenderVectorSource>(staticImmutableCast<VectorSource::Impl>(impl)); diff --git a/src/mbgl/renderer/render_source.hpp b/src/mbgl/renderer/render_source.hpp index ee90e1c4d0..5b6c9de1b7 100644 --- a/src/mbgl/renderer/render_source.hpp +++ b/src/mbgl/renderer/render_source.hpp @@ -47,7 +47,7 @@ using RenderTiles = std::shared_ptr<const std::vector<std::reference_wrapper<con class RenderSource : protected TileObserver { public: - static std::unique_ptr<RenderSource> create(Immutable<style::Source::Impl>); + static std::unique_ptr<RenderSource> create(const Immutable<style::Source::Impl>&); virtual ~RenderSource(); bool isEnabled() const; diff --git a/src/mbgl/renderer/renderer.cpp b/src/mbgl/renderer/renderer.cpp index ac2f327a4e..0ec73671d1 100644 --- a/src/mbgl/renderer/renderer.cpp +++ b/src/mbgl/renderer/renderer.cpp @@ -8,7 +8,7 @@ namespace mbgl { -Renderer::Renderer(gfx::RendererBackend& backend, float pixelRatio_, const optional<std::string> localFontFamily_) +Renderer::Renderer(gfx::RendererBackend& backend, float pixelRatio_, const optional<std::string>& localFontFamily_) : impl(std::make_unique<Impl>(backend, pixelRatio_, localFontFamily_)) {} Renderer::~Renderer() { diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp index 113840d059..cdb85385ed 100644 --- a/src/mbgl/renderer/renderer_impl.cpp +++ b/src/mbgl/renderer/renderer_impl.cpp @@ -24,15 +24,11 @@ static RendererObserver& nullObserver() { return observer; } -Renderer::Impl::Impl(gfx::RendererBackend& backend_, - float pixelRatio_, - optional<std::string> localFontFamily_) - : orchestrator(!backend_.contextIsShared(), std::move(localFontFamily_)) - , backend(backend_) - , observer(&nullObserver()) - , pixelRatio(pixelRatio_) { - -} +Renderer::Impl::Impl(gfx::RendererBackend& backend_, float pixelRatio_, const optional<std::string>& localFontFamily_) + : orchestrator(!backend_.contextIsShared(), localFontFamily_), + backend(backend_), + observer(&nullObserver()), + pixelRatio(pixelRatio_) {} Renderer::Impl::~Impl() { assert(gfx::BackendScope::exists()); diff --git a/src/mbgl/renderer/renderer_impl.hpp b/src/mbgl/renderer/renderer_impl.hpp index 5f04bfdfed..53c5b8d4dd 100644 --- a/src/mbgl/renderer/renderer_impl.hpp +++ b/src/mbgl/renderer/renderer_impl.hpp @@ -17,9 +17,7 @@ class RendererBackend; class Renderer::Impl { public: - Impl(gfx::RendererBackend&, - float pixelRatio_, - optional<std::string> localFontFamily_); + Impl(gfx::RendererBackend&, float pixelRatio_, const optional<std::string>& localFontFamily_); ~Impl(); private: diff --git a/src/mbgl/renderer/sources/render_geojson_source.cpp b/src/mbgl/renderer/sources/render_geojson_source.cpp index 45a91e3fa0..490abe8a6b 100644 --- a/src/mbgl/renderer/sources/render_geojson_source.cpp +++ b/src/mbgl/renderer/sources/render_geojson_source.cpp @@ -25,12 +25,14 @@ using FeatureExtensionGetterPtr = FeatureExtensionValue (*)(std::shared_ptr<styl std::uint32_t, const optional<std::map<std::string, Value>>&); +// NOLINTNEXTLINE(performance-unnecessary-value-param) FeatureExtensionValue getChildren(std::shared_ptr<style::GeoJSONData> clusterData, std::uint32_t clusterID, const optional<std::map<std::string, Value>>&) { return clusterData->getChildren(clusterID); } +// NOLINTNEXTLINE(performance-unnecessary-value-param) FeatureExtensionValue getLeaves(std::shared_ptr<style::GeoJSONData> clusterData, std::uint32_t clusterID, const optional<std::map<std::string, Value>>& args) { @@ -51,6 +53,7 @@ FeatureExtensionValue getLeaves(std::shared_ptr<style::GeoJSONData> clusterData, return clusterData->getLeaves(clusterID); } +// NOLINTNEXTLINE(performance-unnecessary-value-param) FeatureExtensionValue getClusterExpansionZoom(std::shared_ptr<style::GeoJSONData> clusterData, std::uint32_t clusterID, const optional<std::map<std::string, Value>>&) { |