diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2020-03-03 11:46:44 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2020-03-03 16:13:48 +0200 |
commit | 24fa5999038da096ce714e998061cf76610bb651 (patch) | |
tree | e78214fef1130900530d75d8982e8fe19c5a7b46 | |
parent | f748972fe94f4c6399181e1d6066336049a2549a (diff) | |
download | qtlocation-mapboxgl-24fa5999038da096ce714e998061cf76610bb651.tar.gz |
[core] Split LayerPlacementData and BucketPlacementData
-rw-r--r-- | src/mbgl/renderer/layers/render_symbol_layer.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/render_layer.hpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index a5b9aa32c8..8de6267045 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -589,7 +589,7 @@ void RenderSymbolLayer::prepare(const LayerPrepareParameters& params) { placementData.push_back({*bucket, renderTile, featureIndex, nullopt}); } else { for (const auto& sortKeyRange : bucket->sortKeyRanges) { - LayerPlacementData layerData{*bucket, renderTile, featureIndex, sortKeyRange}; + BucketPlacementData layerData{*bucket, renderTile, featureIndex, sortKeyRange}; auto sortPosition = std::upper_bound( placementData.cbegin(), placementData.cend(), layerData, [](const auto& lhs, const auto& rhs) { assert(lhs.sortKeyRange && rhs.sortKeyRange); diff --git a/src/mbgl/renderer/render_layer.hpp b/src/mbgl/renderer/render_layer.hpp index 9c87a7e225..40d073d562 100644 --- a/src/mbgl/renderer/render_layer.hpp +++ b/src/mbgl/renderer/render_layer.hpp @@ -36,7 +36,7 @@ public: size_t end; }; -class LayerPlacementData { +class BucketPlacementData { public: std::reference_wrapper<Bucket> bucket; std::reference_wrapper<const RenderTile> tile; @@ -44,6 +44,8 @@ public: optional<SortKeyRange> sortKeyRange; }; +using LayerPlacementData = std::list<BucketPlacementData>; + class LayerPrepareParameters { public: RenderSource* source; @@ -105,7 +107,7 @@ public: virtual void prepare(const LayerPrepareParameters&); - const std::list<LayerPlacementData>& getPlacementData() const { return placementData; } + const LayerPlacementData& getPlacementData() const { return placementData; } // Latest evaluated properties. Immutable<style::LayerProperties> evaluatedProperties; @@ -134,7 +136,7 @@ protected: // evaluated StyleProperties object and is updated accordingly. RenderPass passes = RenderPass::None; - std::list<LayerPlacementData> placementData; + LayerPlacementData placementData; private: // Some layers may not render correctly on some hardware when the vertex attribute limit of |