summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/layers/render_symbol_layer.cpp
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-05-13 11:25:29 +0300
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-05-14 11:19:56 +0300
commit81823e35a68eb87d9433457fe9983d06793a77bf (patch)
tree8fd4fa93dd552d837b9014fda5a56bd1a0162ef8 /src/mbgl/renderer/layers/render_symbol_layer.cpp
parentcd24f4c45f6b38e7f3dc73cf0afda9b86b3d85d4 (diff)
downloadqtlocation-mapboxgl-81823e35a68eb87d9433457fe9983d06793a77bf.tar.gz
[core] RenderTile shall never be created for a not renderable tile
A RenderTile is already never created for a not renderable tile, guarantied by the checks in `updateRenderables()`. However, the client code had plenty of `isRenderable()` checks in the render path, which complicated the code and affected rendering performance. This patch removes the unneeded checks from the client code and puts an assertion to `TilePyramid::addRenderTile()`.
Diffstat (limited to 'src/mbgl/renderer/layers/render_symbol_layer.cpp')
-rw-r--r--src/mbgl/renderer/layers/render_symbol_layer.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp
index 37c33844ac..5c0aea0eac 100644
--- a/src/mbgl/renderer/layers/render_symbol_layer.cpp
+++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp
@@ -617,8 +617,7 @@ style::TextPaintProperties::PossiblyEvaluated RenderSymbolLayer::textPaintProper
}
void RenderSymbolLayer::setRenderTiles(RenderTiles tiles, const TransformState& state) {
- auto filterFn = [](auto& tile){ return !tile.tile.isRenderable(); };
- renderTiles = RenderLayer::filterRenderTiles(std::move(tiles), filterFn);
+ renderTiles = std::move(tiles);
// 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(), [&state](const auto& a, const auto& b) {