1 files changed, 42 insertions, 37 deletions

diff --git a/src/mbgl/renderer/sources/render_vector_source.cpp b/src/mbgl/renderer/sources/render_vector_source.cpp
index 0db4698a81..4302fb21ee 100644
--- a/src/mbgl/renderer/sources/render_vector_source.cpp
+++ b/src/mbgl/renderer/sources/render_vector_source.cpp
@@ -1,5 +1,6 @@
 #include <mbgl/renderer/sources/render_vector_source.hpp>
 #include <mbgl/renderer/render_tile.hpp>
+#include <mbgl/renderer/painter.hpp>
 #include <mbgl/tile/vector_tile.hpp>
 
 #include <mbgl/algorithm/generate_clip_ids.hpp>
@@ -9,35 +10,29 @@ namespace mbgl {
 
 using namespace style;
 
-RenderVectorSource::RenderVectorSource(const style::VectorSource::Impl& impl_)
-    : RenderSource(impl_),
-      impl(impl_) {
+RenderVectorSource::RenderVectorSource(Immutable<style::VectorSource::Impl> impl_)
+    : RenderSource(impl_) {
     tilePyramid.setObserver(this);
 }
 
+const style::VectorSource::Impl& RenderVectorSource::impl() const {
+    return static_cast<const style::VectorSource::Impl&>(*baseImpl);
+}
+
 bool RenderVectorSource::isLoaded() const {
     return tilePyramid.isLoaded();
 }
 
-void RenderVectorSource::invalidateTiles() {
-    tilePyramid.invalidateTiles();
-}
+void RenderVectorSource::update(Immutable<style::Source::Impl> baseImpl_,
+                                const std::vector<Immutable<Layer::Impl>>& layers,
+                                const bool needsRendering,
+                                const bool needsRelayout,
+                                const TileParameters& parameters) {
+    std::swap(baseImpl, baseImpl_);
 
-void RenderVectorSource::startRender(algorithm::ClipIDGenerator& generator, const mat4& projMatrix, const mat4& clipMatrix, const TransformState& transform) {
-    generator.update(tilePyramid.getRenderTiles());
-    tilePyramid.startRender(projMatrix, clipMatrix, transform);
-}
+    enabled = needsRendering;
 
-void RenderVectorSource::finishRender(Painter& painter) {
-    tilePyramid.finishRender(painter);
-}
-
-std::map<UnwrappedTileID, RenderTile>& RenderVectorSource::getRenderTiles() {
-    return tilePyramid.getRenderTiles();
-}
-
-void RenderVectorSource::updateTiles(const TileParameters& parameters) {
-    optional<Tileset> tileset = impl.getTileset();
+    optional<Tileset> tileset = impl().getTileset();
 
     if (!tileset) {
         return;
@@ -45,41 +40,51 @@ void RenderVectorSource::updateTiles(const TileParameters& parameters) {
 
     if (tileURLTemplates != tileset->tiles) {
         tileURLTemplates = tileset->tiles;
-        tilePyramid.invalidateTiles();
+
+        // TODO: this removes existing buckets, and will cause flickering.
+        // Should instead refresh tile data in place.
+        tilePyramid.tiles.clear();
+        tilePyramid.renderTiles.clear();
+        tilePyramid.cache.clear();
     }
 
-    tilePyramid.updateTiles(parameters,
-                            SourceType::Vector,
-                            util::tileSize,
-                            tileset->zoomRange,
-                            [&] (const OverscaledTileID& tileID) {
-                                return std::make_unique<VectorTile>(tileID, impl.id, parameters, *tileset);
-                            });
+    tilePyramid.update(layers,
+                       needsRendering,
+                       needsRelayout,
+                       parameters,
+                       SourceType::Vector,
+                       util::tileSize,
+                       tileset->zoomRange,
+                       [&] (const OverscaledTileID& tileID) {
+                           return std::make_unique<VectorTile>(tileID, impl().id, parameters, *tileset);
+                       });
 }
 
-void RenderVectorSource::removeTiles() {
-    tilePyramid.removeTiles();
+void RenderVectorSource::startRender(Painter& painter) {
+    painter.clipIDGenerator.update(tilePyramid.getRenderTiles());
+    tilePyramid.startRender(painter);
+}
+
+void RenderVectorSource::finishRender(Painter& painter) {
+    tilePyramid.finishRender(painter);
 }
 
-void RenderVectorSource::reloadTiles() {
-    tilePyramid.reloadTiles();
+std::map<UnwrappedTileID, RenderTile>& RenderVectorSource::getRenderTiles() {
+    return tilePyramid.getRenderTiles();
 }
 
 std::unordered_map<std::string, std::vector<Feature>>
 RenderVectorSource::queryRenderedFeatures(const ScreenLineString& geometry,
                                           const TransformState& transformState,
+                                          const RenderStyle& style,
                                           const RenderedQueryOptions& options) const {
-    return tilePyramid.queryRenderedFeatures(geometry, transformState, options);
+    return tilePyramid.queryRenderedFeatures(geometry, transformState, style, options);
 }
 
 std::vector<Feature> RenderVectorSource::querySourceFeatures(const SourceQueryOptions& options) const {
     return tilePyramid.querySourceFeatures(options);
 }
 
-void RenderVectorSource::setCacheSize(size_t size) {
-    tilePyramid.setCacheSize(size);
-}
-
 void RenderVectorSource::onLowMemory() {
     tilePyramid.onLowMemory();
 }