Bump Mapbox GL Nativeqt-v1.2.0

mapbox-gl-native @ cf3357ea4517e74ba3a63434c330a1506064b130

1 files changed, 12 insertions, 4 deletions

diff --git a/src/mbgl/layout/symbol_instance.hpp b/src/mbgl/layout/symbol_instance.hpp
index f1df416cd1..827a5dbbdb 100644
--- a/src/mbgl/layout/symbol_instance.hpp
+++ b/src/mbgl/layout/symbol_instance.hpp
@@ -5,6 +5,7 @@
 #include <mbgl/text/collision_feature.hpp>
 #include <mbgl/style/layers/symbol_layer_properties.hpp>
 
+
 namespace mbgl {
 
 class Anchor;
@@ -18,7 +19,6 @@ public:
                    optional<PositionedIcon> shapedIcon,
                    const style::SymbolLayoutProperties::Evaluated&,
                    const float layoutTextSize,
-                   const bool inside,
                    const uint32_t index,
                    const float textBoxScale,
                    const float textPadding,
@@ -26,18 +26,20 @@ public:
                    const std::array<float, 2> textOffset,
                    const float iconBoxScale,
                    const float iconPadding,
-                   style::SymbolPlacementType iconPlacement,
                    const std::array<float, 2> iconOffset,
                    const GlyphPositionMap&,
                    const IndexedSubfeature&,
-                   const std::size_t featureIndex);
+                   const std::size_t featureIndex,
+                   const std::u16string& key,
+                   const float overscaling);
 
     Anchor anchor;
     GeometryCoordinates line;
     uint32_t index;
     bool hasText;
     bool hasIcon;
-    SymbolQuads glyphQuads;
+    SymbolQuads horizontalGlyphQuads;
+    SymbolQuads verticalGlyphQuads;
     optional<SymbolQuad> iconQuad;
     CollisionFeature textCollisionFeature;
     CollisionFeature iconCollisionFeature;
@@ -45,6 +47,12 @@ public:
     std::size_t featureIndex;
     std::array<float, 2> textOffset;
     std::array<float, 2> iconOffset;
+    std::u16string key;
+    bool isDuplicate;
+    optional<size_t> placedTextIndex;
+    optional<size_t> placedVerticalTextIndex;
+    optional<size_t> placedIconIndex;
+    uint32_t crossTileID = 0;
 };
 
 } // namespace mbgl