From 57402314e1be3180ce6f67d8ba29c17aceba6b60 Mon Sep 17 00:00:00 2001 From: Alexander Shalamov Date: Mon, 17 Jun 2019 15:04:10 +0300 Subject: [core] Improve performance for query rendered features - query rendered symbols only from layers that support it - remove unnecessary iterations over vectors --- src/mbgl/annotation/render_annotation_source.cpp | 2 +- src/mbgl/annotation/render_annotation_source.hpp | 2 +- src/mbgl/geometry/feature_index.cpp | 21 ++++------- src/mbgl/geometry/feature_index.hpp | 6 ++-- src/mbgl/renderer/render_orchestrator.cpp | 42 ++++++++++++++-------- src/mbgl/renderer/render_orchestrator.hpp | 4 +-- src/mbgl/renderer/render_source.hpp | 2 +- src/mbgl/renderer/sources/render_image_source.cpp | 2 +- src/mbgl/renderer/sources/render_image_source.hpp | 2 +- .../renderer/sources/render_raster_dem_source.cpp | 2 +- .../renderer/sources/render_raster_dem_source.hpp | 2 +- src/mbgl/renderer/sources/render_raster_source.cpp | 2 +- src/mbgl/renderer/sources/render_raster_source.hpp | 2 +- src/mbgl/renderer/sources/render_tile_source.cpp | 2 +- src/mbgl/renderer/sources/render_tile_source.hpp | 2 +- src/mbgl/renderer/tile_pyramid.cpp | 2 +- src/mbgl/renderer/tile_pyramid.hpp | 2 +- src/mbgl/tile/geometry_tile.cpp | 10 +++--- src/mbgl/tile/geometry_tile.hpp | 4 +-- src/mbgl/tile/tile.cpp | 4 +-- src/mbgl/tile/tile.hpp | 4 +-- 21 files changed, 63 insertions(+), 58 deletions(-) diff --git a/src/mbgl/annotation/render_annotation_source.cpp b/src/mbgl/annotation/render_annotation_source.cpp index 123a776754..903825d5f5 100644 --- a/src/mbgl/annotation/render_annotation_source.cpp +++ b/src/mbgl/annotation/render_annotation_source.cpp @@ -46,7 +46,7 @@ void RenderAnnotationSource::update(Immutable baseImpl_, std::unordered_map> RenderAnnotationSource::queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const std::vector& layers, + const std::unordered_map& layers, const RenderedQueryOptions& options, const mat4& projMatrix) const { return tilePyramid.queryRenderedFeatures(geometry, transformState, layers, options, projMatrix); diff --git a/src/mbgl/annotation/render_annotation_source.hpp b/src/mbgl/annotation/render_annotation_source.hpp index 948a0b0d8d..c920d760c2 100644 --- a/src/mbgl/annotation/render_annotation_source.hpp +++ b/src/mbgl/annotation/render_annotation_source.hpp @@ -18,7 +18,7 @@ public: std::unordered_map> queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const std::vector& layers, + const std::unordered_map& layers, const RenderedQueryOptions& options, const mat4& projMatrix) const final; diff --git a/src/mbgl/geometry/feature_index.cpp b/src/mbgl/geometry/feature_index.cpp index f61f89b8e7..3675e8bc6e 100644 --- a/src/mbgl/geometry/feature_index.cpp +++ b/src/mbgl/geometry/feature_index.cpp @@ -47,7 +47,7 @@ void FeatureIndex::query( const double scale, const RenderedQueryOptions& queryOptions, const UnwrappedTileID& tileID, - const std::vector& layers, + const std::unordered_map& layers, const float additionalQueryPadding) const { if (!tileData) { @@ -81,7 +81,7 @@ void FeatureIndex::query( std::unordered_map> FeatureIndex::lookupSymbolFeatures(const std::vector& symbolFeatures, const RenderedQueryOptions& queryOptions, - const std::vector& layers, + const std::unordered_map& layers, const OverscaledTileID& tileID, const std::shared_ptr>& featureSortOrder) const { std::unordered_map> result; @@ -123,31 +123,24 @@ void FeatureIndex::addFeature( const IndexedSubfeature& indexedFeature, const RenderedQueryOptions& options, const CanonicalTileID& tileID, - const std::vector& layers, + const std::unordered_map& layers, const GeometryCoordinates& queryGeometry, const TransformState& transformState, const float pixelsToTileUnits, const mat4& posMatrix) const { - auto getRenderLayer = [&] (const std::string& layerID) -> const RenderLayer* { - for (const auto& layer : layers) { - if (layer->getID() == layerID) { - return layer; - } - } - return nullptr; - }; - // Lazily calculated. std::unique_ptr sourceLayer; std::unique_ptr geometryTileFeature; for (const std::string& layerID : bucketLayerIDs.at(indexedFeature.bucketLeaderID)) { - const RenderLayer* renderLayer = getRenderLayer(layerID); - if (!renderLayer) { + const auto it = layers.find(layerID); + if (it == layers.end()) { continue; } + const RenderLayer* renderLayer = it->second; + if (!geometryTileFeature) { sourceLayer = tileData->getLayer(indexedFeature.sourceLayerName); assert(sourceLayer); diff --git a/src/mbgl/geometry/feature_index.hpp b/src/mbgl/geometry/feature_index.hpp index cd041a7fdb..1a212761fa 100644 --- a/src/mbgl/geometry/feature_index.hpp +++ b/src/mbgl/geometry/feature_index.hpp @@ -67,7 +67,7 @@ public: const double scale, const RenderedQueryOptions& options, const UnwrappedTileID&, - const std::vector&, + const std::unordered_map&, const float additionalQueryPadding) const; static optional translateQueryGeometry( @@ -82,7 +82,7 @@ public: std::unordered_map> lookupSymbolFeatures( const std::vector& symbolFeatures, const RenderedQueryOptions& options, - const std::vector& layers, + const std::unordered_map& layers, const OverscaledTileID& tileID, const std::shared_ptr>& featureSortOrder) const; @@ -92,7 +92,7 @@ private: const IndexedSubfeature&, const RenderedQueryOptions& options, const CanonicalTileID&, - const std::vector&, + const std::unordered_map&, const GeometryCoordinates& queryGeometry, const TransformState& transformState, const float pixelsToTileUnits, diff --git a/src/mbgl/renderer/render_orchestrator.cpp b/src/mbgl/renderer/render_orchestrator.cpp index fafbc8b635..c42273eca2 100644 --- a/src/mbgl/renderer/render_orchestrator.cpp +++ b/src/mbgl/renderer/render_orchestrator.cpp @@ -409,16 +409,16 @@ std::unique_ptr RenderOrchestrator::createRenderTree(const UpdatePar } std::vector RenderOrchestrator::queryRenderedFeatures(const ScreenLineString& geometry, const RenderedQueryOptions& options) const { - std::vector layers; + std::unordered_map layers; if (options.layerIDs) { for (const auto& layerID : *options.layerIDs) { if (const RenderLayer* layer = getRenderLayer(layerID)) { - layers.emplace_back(layer); + layers.emplace(layer->getID(), layer); } } } else { for (const auto& entry : renderLayers) { - layers.emplace_back(entry.second.get()); + layers.emplace(entry.second->getID(), entry.second.get()); } } @@ -427,9 +427,22 @@ std::vector RenderOrchestrator::queryRenderedFeatures(const ScreenLineS void RenderOrchestrator::queryRenderedSymbols(std::unordered_map>& resultsByLayer, const ScreenLineString& geometry, - const std::vector& layers, + const std::unordered_map& layers, const RenderedQueryOptions& options) const { - + const auto hasCrossTileIndex = [] (const auto& pair) { + return pair.second->baseImpl->getTypeInfo()->crossTileIndex == style::LayerTypeInfo::CrossTileIndex::Required; + }; + + std::unordered_map crossTileSymbolIndexLayers; + std::copy_if(layers.begin(), + layers.end(), + std::inserter(crossTileSymbolIndexLayers, crossTileSymbolIndexLayers.begin()), + hasCrossTileIndex); + + if (crossTileSymbolIndexLayers.empty()) { + return; + } + auto renderedSymbols = placement->getCollisionIndex().queryRenderedSymbols(geometry); std::vector> bucketQueryData; for (auto entry : renderedSymbols) { @@ -447,7 +460,7 @@ void RenderOrchestrator::queryRenderedSymbols(std::unordered_maplookupSymbolFeatures(renderedSymbols[queryData.bucketInstanceId], options, - layers, + crossTileSymbolIndexLayers, queryData.tileID, queryData.featureSortOrder); @@ -458,10 +471,10 @@ void RenderOrchestrator::queryRenderedSymbols(std::unordered_map RenderOrchestrator::queryRenderedFeatures(const ScreenLineString& geometry, const RenderedQueryOptions& options, const std::vector& layers) const { +std::vector RenderOrchestrator::queryRenderedFeatures(const ScreenLineString& geometry, const RenderedQueryOptions& options, const std::unordered_map& layers) const { std::unordered_set sourceIDs; - for (const RenderLayer* layer : layers) { - sourceIDs.emplace(layer->baseImpl->source); + for (const auto& pair : layers) { + sourceIDs.emplace(pair.second->baseImpl->source); } mat4 projMatrix; @@ -484,13 +497,12 @@ std::vector RenderOrchestrator::queryRenderedFeatures(const ScreenLineS } // Combine all results based on the style layer renderItems. - for (const auto& layerImpl : *layerImpls) { - const RenderLayer* layer = getRenderLayer(layerImpl->id); - if (!layer->needsRendering() || !layer->supportsZoom(zoomHistory.lastZoom)) { + for (const auto& pair : layers) { + if (!pair.second->needsRendering() || !pair.second->supportsZoom(zoomHistory.lastZoom)) { continue; } - auto it = resultsByLayer.find(layer->baseImpl->id); + auto it = resultsByLayer.find(pair.second->baseImpl->id); if (it != resultsByLayer.end()) { std::move(it->second.begin(), it->second.end(), std::back_inserter(result)); } @@ -501,13 +513,13 @@ std::vector RenderOrchestrator::queryRenderedFeatures(const ScreenLineS std::vector RenderOrchestrator::queryShapeAnnotations(const ScreenLineString& geometry) const { assert(LayerManager::annotationsEnabled); - std::vector shapeAnnotationLayers; + std::unordered_map shapeAnnotationLayers; RenderedQueryOptions options; for (const auto& layerImpl : *layerImpls) { if (std::mismatch(layerImpl->id.begin(), layerImpl->id.end(), AnnotationManager::ShapeLayerID.begin(), AnnotationManager::ShapeLayerID.end()).second == AnnotationManager::ShapeLayerID.end()) { if (const RenderLayer* layer = getRenderLayer(layerImpl->id)) { - shapeAnnotationLayers.emplace_back(layer); + shapeAnnotationLayers.emplace(layer->getID(), layer); } } } diff --git a/src/mbgl/renderer/render_orchestrator.hpp b/src/mbgl/renderer/render_orchestrator.hpp index a60bac2e16..4622ac1749 100644 --- a/src/mbgl/renderer/render_orchestrator.hpp +++ b/src/mbgl/renderer/render_orchestrator.hpp @@ -74,10 +74,10 @@ private: void queryRenderedSymbols(std::unordered_map>& resultsByLayer, const ScreenLineString& geometry, - const std::vector& layers, + const std::unordered_map& layers, const RenderedQueryOptions& options) const; - std::vector queryRenderedFeatures(const ScreenLineString&, const RenderedQueryOptions&, const std::vector&) const; + std::vector queryRenderedFeatures(const ScreenLineString&, const RenderedQueryOptions&, const std::unordered_map&) const; // GlyphManagerObserver implementation. void onGlyphsError(const FontStack&, const GlyphRange&, std::exception_ptr) override; diff --git a/src/mbgl/renderer/render_source.hpp b/src/mbgl/renderer/render_source.hpp index fc770f83cf..2a4983e799 100644 --- a/src/mbgl/renderer/render_source.hpp +++ b/src/mbgl/renderer/render_source.hpp @@ -72,7 +72,7 @@ public: virtual std::unordered_map> queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const std::vector& layers, + const std::unordered_map& layers, const RenderedQueryOptions& options, const mat4& projMatrix) const = 0; diff --git a/src/mbgl/renderer/sources/render_image_source.cpp b/src/mbgl/renderer/sources/render_image_source.cpp index 7e793c6a4a..6d197df9db 100644 --- a/src/mbgl/renderer/sources/render_image_source.cpp +++ b/src/mbgl/renderer/sources/render_image_source.cpp @@ -106,7 +106,7 @@ void RenderImageSource::prepare(const SourcePrepareParameters& parameters) { std::unordered_map> RenderImageSource::queryRenderedFeatures(const ScreenLineString&, const TransformState&, - const std::vector&, + const std::unordered_map&, const RenderedQueryOptions&, const mat4&) const { return std::unordered_map> {}; diff --git a/src/mbgl/renderer/sources/render_image_source.hpp b/src/mbgl/renderer/sources/render_image_source.hpp index d21f4fae10..4264f74564 100644 --- a/src/mbgl/renderer/sources/render_image_source.hpp +++ b/src/mbgl/renderer/sources/render_image_source.hpp @@ -57,7 +57,7 @@ public: std::unordered_map> queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const std::vector& layers, + const std::unordered_map& layers, const RenderedQueryOptions& options, const mat4& projMatrix) const final; diff --git a/src/mbgl/renderer/sources/render_raster_dem_source.cpp b/src/mbgl/renderer/sources/render_raster_dem_source.cpp index 9854b4fdc3..841124fa4a 100644 --- a/src/mbgl/renderer/sources/render_raster_dem_source.cpp +++ b/src/mbgl/renderer/sources/render_raster_dem_source.cpp @@ -125,7 +125,7 @@ void RenderRasterDEMSource::onTileChanged(Tile& tile){ std::unordered_map> RenderRasterDEMSource::queryRenderedFeatures(const ScreenLineString&, const TransformState&, - const std::vector&, + const std::unordered_map&, const RenderedQueryOptions&, const mat4&) const { return std::unordered_map>{}; diff --git a/src/mbgl/renderer/sources/render_raster_dem_source.hpp b/src/mbgl/renderer/sources/render_raster_dem_source.hpp index e49ad1d1d4..dd74f4d7e7 100644 --- a/src/mbgl/renderer/sources/render_raster_dem_source.hpp +++ b/src/mbgl/renderer/sources/render_raster_dem_source.hpp @@ -19,7 +19,7 @@ public: std::unordered_map> queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const std::vector& layers, + const std::unordered_map& layers, const RenderedQueryOptions& options, const mat4& projMatrix) const override; diff --git a/src/mbgl/renderer/sources/render_raster_source.cpp b/src/mbgl/renderer/sources/render_raster_source.cpp index 827ffb9759..06eb36795b 100644 --- a/src/mbgl/renderer/sources/render_raster_source.cpp +++ b/src/mbgl/renderer/sources/render_raster_source.cpp @@ -60,7 +60,7 @@ void RenderRasterSource::prepare(const SourcePrepareParameters& parameters) { std::unordered_map> RenderRasterSource::queryRenderedFeatures(const ScreenLineString&, const TransformState&, - const std::vector&, + const std::unordered_map&, const RenderedQueryOptions&, const mat4&) const { return std::unordered_map>{}; diff --git a/src/mbgl/renderer/sources/render_raster_source.hpp b/src/mbgl/renderer/sources/render_raster_source.hpp index dc80630add..0071dddec9 100644 --- a/src/mbgl/renderer/sources/render_raster_source.hpp +++ b/src/mbgl/renderer/sources/render_raster_source.hpp @@ -19,7 +19,7 @@ public: std::unordered_map> queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const std::vector& layers, + const std::unordered_map& layers, const RenderedQueryOptions& options, const mat4& projMatrix) const override; diff --git a/src/mbgl/renderer/sources/render_tile_source.cpp b/src/mbgl/renderer/sources/render_tile_source.cpp index 99bdfde485..93c41940b6 100644 --- a/src/mbgl/renderer/sources/render_tile_source.cpp +++ b/src/mbgl/renderer/sources/render_tile_source.cpp @@ -84,7 +84,7 @@ const Tile* RenderTileSource::getRenderedTile(const UnwrappedTileID& tileID) con std::unordered_map> RenderTileSource::queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const std::vector& layers, + const std::unordered_map& layers, const RenderedQueryOptions& options, const mat4& projMatrix) const { return tilePyramid.queryRenderedFeatures(geometry, transformState, layers, options, projMatrix); diff --git a/src/mbgl/renderer/sources/render_tile_source.hpp b/src/mbgl/renderer/sources/render_tile_source.hpp index e3148b45b9..8ec1439306 100644 --- a/src/mbgl/renderer/sources/render_tile_source.hpp +++ b/src/mbgl/renderer/sources/render_tile_source.hpp @@ -27,7 +27,7 @@ public: std::unordered_map> queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const std::vector& layers, + const std::unordered_map& layers, const RenderedQueryOptions& options, const mat4& projMatrix) const override; diff --git a/src/mbgl/renderer/tile_pyramid.cpp b/src/mbgl/renderer/tile_pyramid.cpp index e08803134d..f47198e275 100644 --- a/src/mbgl/renderer/tile_pyramid.cpp +++ b/src/mbgl/renderer/tile_pyramid.cpp @@ -284,7 +284,7 @@ void TilePyramid::handleWrapJump(float lng) { std::unordered_map> TilePyramid::queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const std::vector& layers, + const std::unordered_map& layers, const RenderedQueryOptions& options, const mat4& projMatrix) const { std::unordered_map> result; diff --git a/src/mbgl/renderer/tile_pyramid.hpp b/src/mbgl/renderer/tile_pyramid.hpp index 675831fbc9..f80eb0db78 100644 --- a/src/mbgl/renderer/tile_pyramid.hpp +++ b/src/mbgl/renderer/tile_pyramid.hpp @@ -52,7 +52,7 @@ public: std::unordered_map> queryRenderedFeatures(const ScreenLineString& geometry, const TransformState& transformState, - const std::vector&, + const std::unordered_map&, const RenderedQueryOptions& options, const mat4& projMatrix) const; diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp index e87d21503a..7f1bed49f4 100644 --- a/src/mbgl/tile/geometry_tile.cpp +++ b/src/mbgl/tile/geometry_tile.cpp @@ -291,12 +291,12 @@ LayerRenderData* GeometryTile::getLayerRenderData(const style::Layer::Impl& laye return layoutResult ? layoutResult->getLayerRenderData(layerImpl) : nullptr; } -float GeometryTile::getQueryPadding(const std::vector& layers) { +float GeometryTile::getQueryPadding(const std::unordered_map& layers) { float queryPadding = 0; - for (const RenderLayer* layer : layers) { - const LayerRenderData* data = getLayerRenderData(*layer->baseImpl); + for (const auto& pair : layers) { + const LayerRenderData* data = getLayerRenderData(*pair.second->baseImpl); if (data && data->bucket && data->bucket->hasData()) { - queryPadding = std::max(queryPadding, data->bucket->getQueryRadius(*layer)); + queryPadding = std::max(queryPadding, data->bucket->getQueryRadius(*pair.second)); } } return queryPadding; @@ -306,7 +306,7 @@ void GeometryTile::queryRenderedFeatures( std::unordered_map>& result, const GeometryCoordinates& queryGeometry, const TransformState& transformState, - const std::vector& layers, + const std::unordered_map& layers, const RenderedQueryOptions& options, const mat4& projMatrix) { diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp index 3d75dfc456..7c46edfc1d 100644 --- a/src/mbgl/tile/geometry_tile.hpp +++ b/src/mbgl/tile/geometry_tile.hpp @@ -52,7 +52,7 @@ public: std::unordered_map>& result, const GeometryCoordinates& queryGeometry, const TransformState&, - const std::vector& layers, + const std::unordered_map& layers, const RenderedQueryOptions& options, const mat4& projMatrix) override; @@ -60,7 +60,7 @@ public: std::vector& result, const SourceQueryOptions&) override; - float getQueryPadding(const std::vector&) override; + float getQueryPadding(const std::unordered_map&) override; void cancel() override; diff --git a/src/mbgl/tile/tile.cpp b/src/mbgl/tile/tile.cpp index 5e31898caf..2f342c092d 100644 --- a/src/mbgl/tile/tile.cpp +++ b/src/mbgl/tile/tile.cpp @@ -43,11 +43,11 @@ void Tile::queryRenderedFeatures( std::unordered_map>&, const GeometryCoordinates&, const TransformState&, - const std::vector&, + const std::unordered_map&, const RenderedQueryOptions&, const mat4&) {} -float Tile::getQueryPadding(const std::vector&) { +float Tile::getQueryPadding(const std::unordered_map&) { return 0; } diff --git a/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp index 4ba8bc1160..7a7d246aa6 100644 --- a/src/mbgl/tile/tile.hpp +++ b/src/mbgl/tile/tile.hpp @@ -71,7 +71,7 @@ public: std::unordered_map>& result, const GeometryCoordinates& queryGeometry, const TransformState&, - const std::vector&, + const std::unordered_map&, const RenderedQueryOptions& options, const mat4& projMatrix); @@ -79,7 +79,7 @@ public: std::vector& result, const SourceQueryOptions&); - virtual float getQueryPadding(const std::vector&); + virtual float getQueryPadding(const std::unordered_map&); void setTriedCache(); -- cgit v1.2.1