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

1 files changed, 28 insertions, 6 deletions

diff --git a/src/mbgl/renderer/render_static_data.cpp b/src/mbgl/renderer/render_static_data.cpp
index 6378ad9989..f7d9c18a78 100644
--- a/src/mbgl/renderer/render_static_data.cpp
+++ b/src/mbgl/renderer/render_static_data.cpp
@@ -50,15 +50,37 @@ static gfx::VertexVector<HeatmapTextureLayoutVertex> heatmapTextureVertices() {
 }
 
 RenderStaticData::RenderStaticData(gfx::Context& context, float pixelRatio)
-    : programs(context, ProgramParameters { pixelRatio, false })
+    : programs(context, ProgramParameters{pixelRatio, false}),
+      clippingMaskSegments(tileTriangleSegments())
 #ifndef NDEBUG
-    , overdrawPrograms(context, ProgramParameters { pixelRatio, true })
+      ,
+      overdrawPrograms(context, ProgramParameters{pixelRatio, true})
 #endif
 {
-    tileTriangleSegments.emplace_back(0, 0, 4, 6);
-    tileBorderSegments.emplace_back(0, 0, 4, 5);
-    rasterSegments.emplace_back(0, 0, 4, 6);
-    heatmapTextureSegments.emplace_back(0, 0, 4, 6);
+}
+
+SegmentVector<BackgroundAttributes> RenderStaticData::tileTriangleSegments() {
+    SegmentVector<BackgroundAttributes> segments;
+    segments.emplace_back(0, 0, 4, 6);
+    return segments;
+}
+
+SegmentVector<DebugAttributes> RenderStaticData::tileBorderSegments() {
+    SegmentVector<DebugAttributes> segments;
+    segments.emplace_back(0, 0, 4, 5);
+    return segments;
+}
+
+SegmentVector<RasterAttributes> RenderStaticData::rasterSegments() {
+    SegmentVector<RasterAttributes> segments;
+    segments.emplace_back(0, 0, 4, 6);
+    return segments;
+}
+
+SegmentVector<HeatmapTextureAttributes> RenderStaticData::heatmapTextureSegments() {
+    SegmentVector<HeatmapTextureAttributes> segments;
+    segments.emplace_back(0, 0, 4, 6);
+    return segments;
 }
 
 void RenderStaticData::upload(gfx::UploadPass& uploadPass) {