diff options
Diffstat (limited to 'src/mbgl/renderer/buckets')
| -rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.hpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.cpp b/src/mbgl/renderer/buckets/symbol_bucket.cpp index 03ab1c87d1..7efd81053e 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.cpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.cpp @@ -24,7 +24,8 @@ SymbolBucket::SymbolBucket(Immutable<style::SymbolLayoutProperties::PossiblyEval const std::vector<SymbolInstance>&& symbolInstances_, float tilePixelRatio_, bool allowVerticalPlacement_, - std::vector<style::TextWritingModeType> placementModes_) + std::vector<style::TextWritingModeType> placementModes_, + bool iconsInText_) : layout(std::move(layout_)), bucketLeaderID(bucketName_), iconsNeedLinear(iconsNeedLinear_ || iconSize.isDataDriven() || !iconSize.isZoomConstant()), @@ -33,6 +34,7 @@ SymbolBucket::SymbolBucket(Immutable<style::SymbolLayoutProperties::PossiblyEval placementChangesUploaded(false), dynamicUploaded(false), sortUploaded(false), + iconsInText(iconsInText_), justReloaded(false), hasVariablePlacement(false), symbolInstances(symbolInstances_), diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp index 3fe6cf20c4..7a60a2c1e4 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.hpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp @@ -61,7 +61,8 @@ public: const std::vector<SymbolInstance>&&, const float tilePixelRatio, bool allowVerticalPlacement, - std::vector<style::TextWritingModeType> placementModes); + std::vector<style::TextWritingModeType> placementModes, + bool iconsInText); ~SymbolBucket() override; void upload(gfx::UploadPass&) override; @@ -95,6 +96,7 @@ public: bool placementChangesUploaded : 1; bool dynamicUploaded : 1; bool sortUploaded : 1; + bool iconsInText : 1; // Set and used by placement. mutable bool justReloaded : 1; bool hasVariablePlacement : 1; |