Use TinyUnorderedMap for render tile sets (#1792)

Co-authored-by: Bart Louwers <bart@emeel.net>
This commit is contained in:
Tim Sylvester
2023-11-01 07:14:01 -07:00
committed by GitHub
parent 5a17559523
commit 9e7f1cc3a5
9 changed files with 685 additions and 26 deletions

View File

@@ -186,34 +186,30 @@ std::size_t RenderLayer::removeAllDrawables() {
}
void RenderLayer::updateRenderTileIDs() {
const auto oldMap = std::move(renderTileIDs);
renderTileIDs = std::unordered_map<OverscaledTileID, util::SimpleIdentity>{};
if (renderTiles) {
renderTileIDs.reserve(renderTiles->size());
for (const auto& tile : *renderTiles) {
// If the tile existed previously, retain the mapped value
const auto tileID = tile.get().getOverscaledTileID();
const auto hit = oldMap.find(tileID);
const auto bucketID = (hit != oldMap.end()) ? hit->second : util::SimpleIdentity::Empty;
[[maybe_unused]] const auto result = renderTileIDs.insert(std::make_pair(tileID, bucketID));
assert(result.second && "Unexpected duplicate TileID in renderTiles");
}
if (!renderTiles || renderTiles->empty()) {
renderTileIDs.clear();
return;
}
newRenderTileIDs.assign(renderTiles->begin(), renderTiles->end(), [&](const auto& tile) {
const auto& tileID = tile.get().getOverscaledTileID();
return std::make_pair(tileID, getRenderTileBucketID(tileID));
});
renderTileIDs.swap(newRenderTileIDs);
}
bool RenderLayer::hasRenderTile(const OverscaledTileID& tileID) const {
return renderTileIDs.find(tileID) != renderTileIDs.end();
return renderTileIDs.find(tileID).has_value();
}
util::SimpleIdentity RenderLayer::getRenderTileBucketID(const OverscaledTileID& tileID) const {
const auto hit = renderTileIDs.find(tileID);
return (hit != renderTileIDs.end()) ? hit->second : util::SimpleIdentity::Empty;
const auto result = renderTileIDs.find(tileID);
return result.has_value() ? result->get() : util::SimpleIdentity::Empty;
}
bool RenderLayer::setRenderTileBucketID(const OverscaledTileID& tileID, util::SimpleIdentity bucketID) {
const auto hit = renderTileIDs.find(tileID);
if (hit != renderTileIDs.end() && hit->second != bucketID) {
hit->second = bucketID;
if (auto result = renderTileIDs.find(tileID); result && result->get() != bucketID) {
result->get() = bucketID;
return true;
}
return false;