From 07138ef4b9c337c919c8f7d3d8ba875828586e16 Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Mon, 8 Jul 2019 17:49:32 +0300 Subject: [core] Share render tiles lists between layers This helps to avoid unneeded allocations. --- src/mbgl/renderer/layers/render_circle_layer.cpp | 3 +- .../layers/render_fill_extrusion_layer.cpp | 5 +-- src/mbgl/renderer/layers/render_fill_layer.cpp | 5 +-- src/mbgl/renderer/layers/render_heatmap_layer.cpp | 3 +- .../renderer/layers/render_hillshade_layer.cpp | 3 +- src/mbgl/renderer/layers/render_line_layer.cpp | 5 +-- src/mbgl/renderer/layers/render_raster_layer.cpp | 7 ++-- src/mbgl/renderer/layers/render_symbol_layer.cpp | 20 +++-------- src/mbgl/renderer/paint_parameters.cpp | 13 +++---- src/mbgl/renderer/render_layer.cpp | 15 ++------ src/mbgl/renderer/render_layer.hpp | 5 +-- src/mbgl/renderer/render_source.hpp | 12 +++++-- src/mbgl/renderer/sources/render_image_source.hpp | 2 -- src/mbgl/renderer/sources/render_tile_source.cpp | 41 ++++++++++++++++++++-- src/mbgl/renderer/sources/render_tile_source.hpp | 6 +++- 15 files changed, 87 insertions(+), 58 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().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().constantOr(mbgl::Faded >{"", ""}); 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().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(*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 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 pa(a.id.canonical.x, a.id.canonical.y); - Point 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(renderTile.getBucket(*baseImpl)); if (bucket && bucket->bucketLeaderID == getID()) { // Only place this layer if it's the "group leader" for the bucket diff --git a/src/mbgl/renderer/paint_parameters.cpp b/src/mbgl/renderer/paint_parameters.cpp index 0bb66972a8..1539c0fbcb 100644 --- a/src/mbgl/renderer/paint_parameters.cpp +++ b/src/mbgl/renderer/paint_parameters.cpp @@ -92,24 +92,25 @@ namespace { // Detects a difference in keys of renderTiles and tileClippingMaskIDs bool tileIDsIdentical(const RenderTiles& renderTiles, const std::map& tileClippingMaskIDs) { - assert(std::is_sorted(renderTiles.begin(), renderTiles.end(), + assert(renderTiles); + assert(std::is_sorted(renderTiles->begin(), renderTiles->end(), [](const RenderTile& a, const RenderTile& b) { return a.id < b.id; })); - if (renderTiles.size() != tileClippingMaskIDs.size()) { + if (renderTiles->size() != tileClippingMaskIDs.size()) { return false; } - return std::equal(renderTiles.begin(), renderTiles.end(), tileClippingMaskIDs.begin(), + return std::equal(renderTiles->begin(), renderTiles->end(), tileClippingMaskIDs.begin(), [](const RenderTile& a, const auto& b) { return a.id == b.first; }); } } // namespace void PaintParameters::renderTileClippingMasks(const RenderTiles& renderTiles) { - if (renderTiles.empty() || tileIDsIdentical(renderTiles, tileClippingMaskIDs)) { + if (!renderTiles || renderTiles->empty() || tileIDsIdentical(renderTiles, tileClippingMaskIDs)) { // The current stencil mask is for this source already; no need to draw another one. return; } - if (nextStencilID + renderTiles.size() > 256) { + if (nextStencilID + renderTiles->size() > 256) { // we'll run out of fresh IDs so we need to clear and start from scratch clearStencil(); } @@ -120,7 +121,7 @@ void PaintParameters::renderTileClippingMasks(const RenderTiles& renderTiles) { const style::Properties<>::PossiblyEvaluated properties {}; const ClippingMaskProgram::Binders paintAttributeData(properties, 0); - for (const RenderTile& renderTile : renderTiles) { + for (const RenderTile& renderTile : *renderTiles) { const int32_t stencilID = nextStencilID++; tileClippingMaskIDs.emplace(renderTile.id, stencilID); diff --git a/src/mbgl/renderer/render_layer.cpp b/src/mbgl/renderer/render_layer.cpp index 821b10050f..3641531e85 100644 --- a/src/mbgl/renderer/render_layer.cpp +++ b/src/mbgl/renderer/render_layer.cpp @@ -47,25 +47,14 @@ bool RenderLayer::supportsZoom(float zoom) const { void RenderLayer::prepare(const LayerPrepareParameters& params) { assert(params.source); - renderTiles = filterRenderTiles(params.source->getRenderTiles()); + renderTiles = params.source->getRenderTiles(); + assert(renderTiles); } optional RenderLayer::getSolidBackground() const { return nullopt; } -RenderTiles RenderLayer::filterRenderTiles(RenderTiles tiles) const { - RenderTiles filtered; - - for (const RenderTile& tile : tiles) { - if (tile.holdForFade()) { - continue; - } - filtered.emplace_back(tile); - } - return filtered; -} - void RenderLayer::markContextDestroyed() { // no-op } diff --git a/src/mbgl/renderer/render_layer.hpp b/src/mbgl/renderer/render_layer.hpp index 11c7587893..c7efdceab4 100644 --- a/src/mbgl/renderer/render_layer.hpp +++ b/src/mbgl/renderer/render_layer.hpp @@ -1,6 +1,7 @@ #pragma once #include #include +#include #include #include #include @@ -15,7 +16,6 @@ class TransitionParameters; class PropertyEvaluationParameters; class UploadParameters; class PaintParameters; -class RenderSource; class RenderTile; class TransformState; class PatternAtlas; @@ -43,8 +43,6 @@ public: const TransformState& state; }; -using RenderTiles = std::vector>; - class RenderLayer { protected: RenderLayer(Immutable); @@ -127,7 +125,6 @@ protected: std::vector placementData; private: - RenderTiles filterRenderTiles(RenderTiles) const; // Some layers may not render correctly on some hardware when the vertex attribute limit of // that GPU is exceeded. More attributes are used when adding many data driven paint properties // to a layer. diff --git a/src/mbgl/renderer/render_source.hpp b/src/mbgl/renderer/render_source.hpp index fc770f83cf..87ca06b453 100644 --- a/src/mbgl/renderer/render_source.hpp +++ b/src/mbgl/renderer/render_source.hpp @@ -43,7 +43,7 @@ public: const ImageManager& imageManager; }; -using RenderTiles = std::vector>; +using RenderTiles = std::shared_ptr>>; class RenderSource : protected TileObserver { public: @@ -64,8 +64,14 @@ public: virtual void prepare(const SourcePrepareParameters&) = 0; virtual void updateFadingTiles() = 0; virtual bool hasFadingTiles() const = 0; - // Returns a list of RenderTiles, sorted by tile id. - virtual RenderTiles getRenderTiles() = 0; + // If supported, returns a shared list of RenderTiles, sorted by tile id and excluding tiles hold for fade; + // returns nullptr otherwise. + virtual RenderTiles getRenderTiles() const { return nullptr; } + // If supported, returns a shared list of RenderTiles, sorted 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; + // returns nullptr otherwise. + virtual RenderTiles getRenderTilesSortedByYPosition() const { return nullptr; } + // If supported, returns pointer to image data; returns nullptr otherwise. virtual const ImageSourceRenderData* getImageRenderData() const { return nullptr; } virtual const Tile* getRenderedTile(const UnwrappedTileID&) const { return nullptr; } diff --git a/src/mbgl/renderer/sources/render_image_source.hpp b/src/mbgl/renderer/sources/render_image_source.hpp index d21f4fae10..f3e43d0508 100644 --- a/src/mbgl/renderer/sources/render_image_source.hpp +++ b/src/mbgl/renderer/sources/render_image_source.hpp @@ -48,8 +48,6 @@ public: bool needsRelayout, const TileParameters&) final; - RenderTiles getRenderTiles() override { return {}; } - const ImageSourceRenderData* getImageRenderData() const override { return renderData.get(); } diff --git a/src/mbgl/renderer/sources/render_tile_source.cpp b/src/mbgl/renderer/sources/render_tile_source.cpp index 99bdfde485..cf6787b6e8 100644 --- a/src/mbgl/renderer/sources/render_tile_source.cpp +++ b/src/mbgl/renderer/sources/render_tile_source.cpp @@ -6,6 +6,7 @@ #include #include #include +#include namespace mbgl { @@ -56,6 +57,9 @@ std::unique_ptr RenderTileSource::createRenderItem() { } void RenderTileSource::prepare(const SourcePrepareParameters& parameters) { + bearing = parameters.transform.state.getBearing(); + filteredRenderTiles = nullptr; + renderTilesSortedByY = nullptr; auto tiles = makeMutable>(); tiles->reserve(tilePyramid.getRenderedTiles().size()); for (auto& entry : tilePyramid.getRenderedTiles()) { @@ -73,8 +77,41 @@ bool RenderTileSource::hasFadingTiles() const { return tilePyramid.hasFadingTiles(); } -RenderTiles RenderTileSource::getRenderTiles() { - return { renderTiles->begin(), renderTiles->end() }; +RenderTiles RenderTileSource::getRenderTiles() const { + if (!filteredRenderTiles) { + auto result = std::make_shared>>(); + for (const auto& renderTile : *renderTiles) { + if (renderTile.holdForFade()) { + continue; + } + result->emplace_back(renderTile); + } + filteredRenderTiles = std::move(result); + } + return filteredRenderTiles; +} + +RenderTiles RenderTileSource::getRenderTilesSortedByYPosition() const { + if (!renderTilesSortedByY) { + const auto comp = [bearing = this->bearing](const RenderTile& a, const RenderTile& b) { + Point pa(a.id.canonical.x, a.id.canonical.y); + Point 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); + }; + + auto result = std::make_shared>>(); + result->reserve(renderTiles->size()); + for (const auto& renderTile : *renderTiles) { + result->emplace_back(renderTile); + } + std::sort(result->begin(), result->end(), comp); + renderTilesSortedByY = std::move(result); + } + return renderTilesSortedByY; } const Tile* RenderTileSource::getRenderedTile(const UnwrappedTileID& tileID) const { diff --git a/src/mbgl/renderer/sources/render_tile_source.hpp b/src/mbgl/renderer/sources/render_tile_source.hpp index e3148b45b9..9e826f0741 100644 --- a/src/mbgl/renderer/sources/render_tile_source.hpp +++ b/src/mbgl/renderer/sources/render_tile_source.hpp @@ -21,7 +21,8 @@ public: void updateFadingTiles() override; bool hasFadingTiles() const override; - RenderTiles getRenderTiles() override; + RenderTiles getRenderTiles() const override; + RenderTiles getRenderTilesSortedByYPosition() const override; const Tile* getRenderedTile(const UnwrappedTileID&) const override; std::unordered_map> @@ -40,6 +41,9 @@ public: protected: TilePyramid tilePyramid; Immutable> renderTiles; + mutable RenderTiles filteredRenderTiles; + mutable RenderTiles renderTilesSortedByY; + float bearing = 0.0f; }; } // namespace mbgl -- cgit v1.2.1