diff options
Diffstat (limited to 'src/mbgl/renderer/layers')
8 files changed, 24 insertions, 27 deletions
diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp index e7496df074..3888e9fec6 100644 --- a/src/mbgl/renderer/layers/render_circle_layer.cpp +++ b/src/mbgl/renderer/layers/render_circle_layer.cpp @@ -53,11 +53,12 @@ bool RenderCircleLayer::hasCrossfade() const { } void RenderCircleLayer::render(PaintParameters& parameters) { + assert(renderTiles); if (parameters.pass == RenderPass::Opaque) { return; } - for (const RenderTile& tile : renderTiles) { + for (const RenderTile& tile : *renderTiles) { const LayerRenderData* renderData = tile.getLayerRenderData(*baseImpl); if (!renderData) { continue; diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp index 29002d8bdf..b8d195cfa1 100644 --- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp @@ -56,6 +56,7 @@ bool RenderFillExtrusionLayer::hasCrossfade() const { } void RenderFillExtrusionLayer::render(PaintParameters& parameters) { + assert(renderTiles); if (parameters.pass != RenderPass::Translucent) { return; } @@ -115,7 +116,7 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters) { if (unevaluated.get<FillExtrusionPattern>().isUndefined()) { // Draw solid color extrusions auto drawTiles = [&](const gfx::StencilMode& stencilMode_, const gfx::ColorMode& colorMode_, const std::string& name) { - for (const RenderTile& tile : renderTiles) { + for (const RenderTile& tile : *renderTiles) { const LayerRenderData* renderData = tile.getLayerRenderData(*baseImpl); if (!renderData) { continue; @@ -162,7 +163,7 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters) { // Draw textured extrusions const auto fillPatternValue = evaluated.get<FillExtrusionPattern>().constantOr(mbgl::Faded<std::basic_string<char> >{"", ""}); auto drawTiles = [&](const gfx::StencilMode& stencilMode_, const gfx::ColorMode& colorMode_, const std::string& name) { - for (const RenderTile& tile : renderTiles) { + for (const RenderTile& tile : *renderTiles) { const LayerRenderData* renderData = tile.getLayerRenderData(*baseImpl); if (!renderData) { continue; diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index c549b338df..6a3c247fbb 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -73,9 +73,10 @@ bool RenderFillLayer::hasCrossfade() const { } void RenderFillLayer::render(PaintParameters& parameters) { + assert(renderTiles); if (unevaluated.get<FillPattern>().isUndefined()) { parameters.renderTileClippingMasks(renderTiles); - for (const RenderTile& tile : renderTiles) { + for (const RenderTile& tile : *renderTiles) { const LayerRenderData* renderData = tile.getLayerRenderData(*baseImpl); if (!renderData) { continue; @@ -162,7 +163,7 @@ void RenderFillLayer::render(PaintParameters& parameters) { parameters.renderTileClippingMasks(renderTiles); - for (const RenderTile& tile : renderTiles) { + for (const RenderTile& tile : *renderTiles) { const LayerRenderData* renderData = tile.getLayerRenderData(*baseImpl); if (!renderData) { continue; diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.cpp b/src/mbgl/renderer/layers/render_heatmap_layer.cpp index 4b80dee5e7..e087d2ca69 100644 --- a/src/mbgl/renderer/layers/render_heatmap_layer.cpp +++ b/src/mbgl/renderer/layers/render_heatmap_layer.cpp @@ -63,6 +63,7 @@ void RenderHeatmapLayer::upload(gfx::UploadPass& uploadPass) { } void RenderHeatmapLayer::render(PaintParameters& parameters) { + assert(renderTiles); if (parameters.pass == RenderPass::Opaque) { return; } @@ -93,7 +94,7 @@ void RenderHeatmapLayer::render(PaintParameters& parameters) { auto renderPass = parameters.encoder->createRenderPass( "heatmap texture", { *renderTexture, Color{ 0.0f, 0.0f, 0.0f, 1.0f }, {}, {} }); - for (const RenderTile& tile : renderTiles) { + for (const RenderTile& tile : *renderTiles) { const LayerRenderData* renderData = tile.getLayerRenderData(*baseImpl); if (!renderData) { continue; diff --git a/src/mbgl/renderer/layers/render_hillshade_layer.cpp b/src/mbgl/renderer/layers/render_hillshade_layer.cpp index 2cbb77f24b..9d1b5293c1 100644 --- a/src/mbgl/renderer/layers/render_hillshade_layer.cpp +++ b/src/mbgl/renderer/layers/render_hillshade_layer.cpp @@ -71,6 +71,7 @@ void RenderHillshadeLayer::prepare(const LayerPrepareParameters& params) { } void RenderHillshadeLayer::render(PaintParameters& parameters) { + assert(renderTiles); if (parameters.pass != RenderPass::Translucent && parameters.pass != RenderPass::Pass3D) return; const auto& evaluated = static_cast<const HillshadeLayerProperties&>(*evaluatedProperties).evaluated; @@ -126,7 +127,7 @@ void RenderHillshadeLayer::render(PaintParameters& parameters) { matrix::ortho(mat, 0, util::EXTENT, -util::EXTENT, 0, 0, 1); matrix::translate(mat, mat, 0, -util::EXTENT, 0); - for (const RenderTile& tile : renderTiles) { + for (const RenderTile& tile : *renderTiles) { auto* bucket_ = tile.getBucket(*baseImpl); if (!bucket_) { continue; diff --git a/src/mbgl/renderer/layers/render_line_layer.cpp b/src/mbgl/renderer/layers/render_line_layer.cpp index 595140634d..061be0aba1 100644 --- a/src/mbgl/renderer/layers/render_line_layer.cpp +++ b/src/mbgl/renderer/layers/render_line_layer.cpp @@ -61,7 +61,7 @@ bool RenderLineLayer::hasCrossfade() const { void RenderLineLayer::prepare(const LayerPrepareParameters& params) { RenderLayer::prepare(params); - for (const RenderTile& tile : renderTiles) { + for (const RenderTile& tile : *renderTiles) { const LayerRenderData* renderData = tile.getLayerRenderData(*baseImpl); if (!renderData) continue; @@ -84,13 +84,14 @@ void RenderLineLayer::upload(gfx::UploadPass& uploadPass) { } void RenderLineLayer::render(PaintParameters& parameters) { + assert(renderTiles); if (parameters.pass == RenderPass::Opaque) { return; } parameters.renderTileClippingMasks(renderTiles); - for (const RenderTile& tile : renderTiles) { + for (const RenderTile& tile : *renderTiles) { const LayerRenderData* renderData = tile.getLayerRenderData(*baseImpl); if (!renderData) { continue; diff --git a/src/mbgl/renderer/layers/render_raster_layer.cpp b/src/mbgl/renderer/layers/render_raster_layer.cpp index e22e14275c..ce1fa52f5e 100644 --- a/src/mbgl/renderer/layers/render_raster_layer.cpp +++ b/src/mbgl/renderer/layers/render_raster_layer.cpp @@ -74,8 +74,9 @@ static std::array<float, 3> spinWeights(float spin) { } void RenderRasterLayer::prepare(const LayerPrepareParameters& params) { - RenderLayer::prepare(params); + renderTiles = params.source->getRenderTiles(); imageData = params.source->getImageRenderData(); + assert(renderTiles || imageData); } void RenderRasterLayer::render(PaintParameters& parameters) { @@ -153,8 +154,8 @@ void RenderRasterLayer::render(PaintParameters& parameters) { }, bucket.drawScopeID + std::to_string(i++)); } - } else { - for (const RenderTile& tile : renderTiles) { + } else if (renderTiles) { + for (const RenderTile& tile : *renderTiles) { auto* bucket_ = tile.getBucket(*baseImpl); if (!bucket_) { continue; 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 |