diff options
| author | Artem Pavlenko <artem@mapnik.org> | 2020-02-14 16:56:46 +0000 |
|---|---|---|
| committer | Artem Pavlenko <artem@mapnik.org> | 2020-02-14 16:56:46 +0000 |
| commit | 145c053a02d918d74002ea690dac398ee588a374 (patch) | |
| tree | c645ffaec12822f0668858181248cd7365fc4e20 /src/mbgl/renderer/render_static_data.hpp | |
| parent | 37a4660ca367f141b9e0dedf3932c74f0ee0c920 (diff) | |
| parent | 59294aaef333bdd455bd13d6bab6fca730379b52 (diff) | |
| download | qtlocation-mapboxgl-upstream/galinelle_setStyle++_updated.tar.gz | |
Merge branch 'master' into galinelle_setStyle++_updatedupstream/galinelle_setStyle++_updated
Diffstat (limited to 'src/mbgl/renderer/render_static_data.hpp')
| -rw-r--r-- | src/mbgl/renderer/render_static_data.hpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mbgl/renderer/render_static_data.hpp b/src/mbgl/renderer/render_static_data.hpp index 6bf2c846f4..22b29387db 100644 --- a/src/mbgl/renderer/render_static_data.hpp +++ b/src/mbgl/renderer/render_static_data.hpp @@ -30,10 +30,10 @@ public: optional<gfx::IndexBuffer> quadTriangleIndexBuffer; optional<gfx::IndexBuffer> tileBorderIndexBuffer; - SegmentVector<BackgroundAttributes> tileTriangleSegments; - SegmentVector<DebugAttributes> tileBorderSegments; - SegmentVector<RasterAttributes> rasterSegments; - SegmentVector<HeatmapTextureAttributes> heatmapTextureSegments; + static SegmentVector<BackgroundAttributes> tileTriangleSegments(); + static SegmentVector<DebugAttributes> tileBorderSegments(); + static SegmentVector<RasterAttributes> rasterSegments(); + static SegmentVector<HeatmapTextureAttributes> heatmapTextureSegments(); optional<gfx::Renderbuffer<gfx::RenderbufferPixelType::Depth>> depthRenderbuffer; bool has3D = false; @@ -42,6 +42,8 @@ public: Programs programs; + const SegmentVector<BackgroundAttributes> clippingMaskSegments; + #ifndef NDEBUG Programs overdrawPrograms; #endif |