Merge branch 'master' into galinelle_setStyle++_updatedupstream/galinelle_setStyle++_updated

1 files changed, 5 insertions, 4 deletions

diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.hpp b/src/mbgl/renderer/layers/render_heatmap_layer.hpp
index 1e9b1063ae..b7a03a6ba5 100644
--- a/src/mbgl/renderer/layers/render_heatmap_layer.hpp
+++ b/src/mbgl/renderer/layers/render_heatmap_layer.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
+#include <mbgl/gfx/offscreen_texture.hpp>
+#include <mbgl/gfx/texture.hpp>
+#include <mbgl/programs/heatmap_program.hpp>
 #include <mbgl/renderer/render_layer.hpp>
 #include <mbgl/style/layers/heatmap_layer_impl.hpp>
 #include <mbgl/style/layers/heatmap_layer_properties.hpp>
-#include <mbgl/gfx/texture.hpp>
-#include <mbgl/gfx/offscreen_texture.hpp>
 #include <mbgl/util/optional.hpp>
 
 namespace mbgl {
@@ -24,14 +25,14 @@ private:
 
     bool queryIntersectsFeature(const GeometryCoordinates&, const GeometryTileFeature&, const float,
                                 const TransformState&, const float, const mat4&, const FeatureState&) const override;
+    void updateColorRamp();
 
     // Paint properties
     style::HeatmapPaintProperties::Unevaluated unevaluated;
     PremultipliedImage colorRamp;
     std::unique_ptr<gfx::OffscreenTexture> renderTexture;
     optional<gfx::Texture> colorRampTexture;
-
-    void updateColorRamp();
+    SegmentVector<HeatmapTextureAttributes> segments;
 };
 
 } // namespace mbgl