summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/buckets/symbol_bucket.cpp
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-07-21 23:11:27 +0300
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-07-22 12:23:39 +0300
commit11bfe2398111dbca232b744db9b50119e7d3c495 (patch)
tree02bc511e315832a780d18ca8f51a8003e5741cb2 /src/mbgl/renderer/buckets/symbol_bucket.cpp
parent3184cb29db069e990dab1ea4e784aad0aaa1048b (diff)
downloadqtlocation-mapboxgl-11bfe2398111dbca232b744db9b50119e7d3c495.tar.gz
[core] Symbol bucket uses shared layout
sizeof(SymbolBucket): 2296 -> 1024
Diffstat (limited to 'src/mbgl/renderer/buckets/symbol_bucket.cpp')
-rw-r--r--src/mbgl/renderer/buckets/symbol_bucket.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.cpp b/src/mbgl/renderer/buckets/symbol_bucket.cpp
index cc26f1b26b..cd9fb08d34 100644
--- a/src/mbgl/renderer/buckets/symbol_bucket.cpp
+++ b/src/mbgl/renderer/buckets/symbol_bucket.cpp
@@ -13,7 +13,7 @@ namespace {
std::atomic<uint32_t> maxBucketInstanceId;
} // namespace
-SymbolBucket::SymbolBucket(style::SymbolLayoutProperties::PossiblyEvaluated layout_,
+SymbolBucket::SymbolBucket(Immutable<style::SymbolLayoutProperties::PossiblyEvaluated> layout_,
const std::map<std::string, Immutable<style::LayerProperties>>& paintProperties_,
const style::PropertyValue<float>& textSize,
const style::PropertyValue<float>& iconSize,
@@ -176,7 +176,7 @@ void SymbolBucket::sortFeatures(const float angle) {
if (!sortFeaturesByY) {
return;
}
- assert (angle != std::numeric_limits<float>::max());
+ assert(angle != std::numeric_limits<float>::max());
if (sortedAngle == angle) {
return;
@@ -246,7 +246,7 @@ std::vector<std::reference_wrapper<SymbolInstance>> SymbolBucket::getSortedSymbo
bool SymbolBucket::hasFormatSectionOverrides() const {
if (!hasFormatSectionOverrides_) {
- hasFormatSectionOverrides_= SymbolLayerPaintPropertyOverrides::hasOverrides(layout.get<TextField>());
+ hasFormatSectionOverrides_= SymbolLayerPaintPropertyOverrides::hasOverrides(layout->get<TextField>());
}
return *hasFormatSectionOverrides_;
}