[core] SymbolBucket updates complete at placement stage

`RenderSymbolLayer` does not have to update dynamic vertices of its buckets, this logic is moved to placement (which is already updates opacity vertices).

* fixes clustering of labels when text variable placement enabled - as assignes `usesVariablePlacement` per bucket
* simplifies the code in `RenderSymbolLayer` (the `RenderSymbolLayer::upload()`	is now omitted).
* symbol buckets are not modified after orchestration finishes

1 files changed, 2 insertions, 4 deletions

diff --git a/src/mbgl/text/placement.hpp b/src/mbgl/text/placement.hpp
index e0fcac3350..c159286a2b 100644
--- a/src/mbgl/text/placement.hpp
+++ b/src/mbgl/text/placement.hpp
@@ -105,7 +105,7 @@ public:
     Placement(const TransformState&, MapMode, style::TransitionOptions, const bool crossSourceCollisions, std::unique_ptr<Placement> prevPlacementOrNull = nullptr);
     void placeLayer(const RenderLayer&, const mat4&, bool showCollisionBoxes);
     void commit(TimePoint);
-    void updateLayerOpacities(const RenderLayer&);
+    void updateLayerBuckets(const RenderLayer&, bool updateOpacities);
     float symbolFadeChange(TimePoint now) const;
     bool hasTransitions(TimePoint now) const;
 
@@ -116,9 +116,6 @@ public:
     void setStale();
     
     const RetainedQueryData& getQueryData(uint32_t bucketInstanceId) const;
-    using VariableOffsets = std::unordered_map<uint32_t, VariableOffset>;
-    const VariableOffsets& getVariableOffsets() const { return variableOffsets; }
-
 private:
     friend SymbolBucket;
     void placeLayerBucket(
@@ -126,6 +123,7 @@ private:
             const BucketPlacementParameters&,
             std::set<uint32_t>& seenCrossTileIDs);
 
+    void updateBucketDynamicVertices(SymbolBucket& bucket, const RenderTile& tile);
     void updateBucketOpacities(SymbolBucket&, std::set<uint32_t>&);
     void markUsedJustification(SymbolBucket&, style::TextVariableAnchorType, SymbolInstance&);