diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-07-08 17:49:32 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-07-09 12:34:58 +0300 |
commit | 929824ecc3176c01a5f3e74d80e2ae2ba2cf1e51 (patch) | |
tree | e0bf2f80fe2779759a43faecb3d6c6902be70289 /src/mbgl/renderer/layers/render_symbol_layer.cpp | |
parent | 81fc49502307dcf6a390b86fc62f6affc5f2b365 (diff) | |
download | qtlocation-mapboxgl-929824ecc3176c01a5f3e74d80e2ae2ba2cf1e51.tar.gz |
[core] Share render tiles lists between layers
This helps to avoid unneeded allocations.
Diffstat (limited to 'src/mbgl/renderer/layers/render_symbol_layer.cpp')
-rw-r--r-- | src/mbgl/renderer/layers/render_symbol_layer.cpp | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index 60b0c8e2d8..b24e088ac4 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -276,6 +276,7 @@ bool RenderSymbolLayer::hasCrossfade() const { } void RenderSymbolLayer::render(PaintParameters& parameters) { + assert(renderTiles); if (parameters.pass == RenderPass::Opaque) { return; } @@ -348,7 +349,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters) { ); }; - for (const RenderTile& tile : renderTiles) { + for (const RenderTile& tile : *renderTiles) { const LayerRenderData* renderData = tile.getLayerRenderData(*baseImpl); if (!renderData) { continue; @@ -493,22 +494,11 @@ style::TextPaintProperties::PossiblyEvaluated RenderSymbolLayer::textPaintProper } void RenderSymbolLayer::prepare(const LayerPrepareParameters& params) { - renderTiles = params.source->getRenderTiles(); - const auto comp = [bearing = params.state.getBearing()](const RenderTile& a, const RenderTile& b) { - Point<float> pa(a.id.canonical.x, a.id.canonical.y); - Point<float> pb(b.id.canonical.x, b.id.canonical.y); - - auto par = util::rotate(pa, bearing); - auto pbr = util::rotate(pb, bearing); - - return std::tie(b.id.canonical.z, par.y, par.x) < std::tie(a.id.canonical.z, pbr.y, pbr.x); - }; - // Sort symbol tiles in opposite y position, so tiles with overlapping symbols are drawn - // on top of each other, with lower symbols being drawn on top of higher symbols. - std::sort(renderTiles.begin(), renderTiles.end(), comp); + renderTiles = params.source->getRenderTilesSortedByYPosition(); + assert(renderTiles); placementData.clear(); - for (const RenderTile& renderTile : renderTiles) { + for (const RenderTile& renderTile : *renderTiles) { auto* bucket = static_cast<SymbolBucket*>(renderTile.getBucket(*baseImpl)); if (bucket && bucket->bucketLeaderID == getID()) { // Only place this layer if it's the "group leader" for the bucket |