From c763c262c87a4ae76489e856cc58392c853372a1 Mon Sep 17 00:00:00 2001
From: Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>
Date: Sat, 3 Aug 2019 20:47:46 +0300
Subject: [core] Remove ProjectedCollisionBox from CollisionBox

- Minus 20 bytes from CollisionBox size.
- Fix constness at Placement::placeBucket
---
 src/mbgl/renderer/buckets/symbol_bucket.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mbgl/renderer/buckets/symbol_bucket.hpp')

diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp
index c22a168a0c..a94073f7d0 100644
--- a/src/mbgl/renderer/buckets/symbol_bucket.hpp
+++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp
@@ -70,7 +70,7 @@ public:
 
     void sortFeatures(const float angle);
     // The result contains references to the `symbolInstances` items, sorted by viewport Y.
-    std::vector<std::reference_wrapper<SymbolInstance>> getSortedSymbols(const float angle);
+    std::vector<std::reference_wrapper<const SymbolInstance>> getSortedSymbols(const float angle) const;
 
     Immutable<style::SymbolLayoutProperties::PossiblyEvaluated> layout;
     const std::string bucketLeaderID;
@@ -84,7 +84,8 @@ public:
     bool placementChangesUploaded : 1;
     bool dynamicUploaded : 1;
     bool sortUploaded : 1;
-    bool justReloaded : 1;
+    // Set and used by placement.
+    mutable bool justReloaded : 1;
     bool hasVariablePlacement : 1;
 
     std::vector<SymbolInstance> symbolInstances;
@@ -113,8 +114,7 @@ public:
 
     std::unique_ptr<SymbolSizeBinder> iconSizeBinder;
 
-    struct IconBuffer : public Buffer {
-    } icon;
+    Buffer icon;
 
     struct CollisionBuffer {
         gfx::VertexVector<gfx::Vertex<CollisionBoxLayoutAttributes>> vertices;
-- 
cgit v1.2.1