1 files changed, 13 insertions, 5 deletions
diff --git a/src/mbgl/tile/tile.hpp b/src/mbgl/tile/tile.hpp
index 795fd62140..39cc0de8bd 100644
--- a/src/mbgl/tile/tile.hpp
+++ b/src/mbgl/tile/tile.hpp
@@ -6,9 +6,11 @@
 #include <mbgl/util/feature.hpp>
 #include <mbgl/util/tile_coordinate.hpp>
 #include <mbgl/tile/tile_id.hpp>
+#include <mbgl/renderer/tile_mask.hpp>
 #include <mbgl/renderer/bucket.hpp>
 #include <mbgl/tile/geometry_tile_data.hpp>
 #include <mbgl/storage/resource.hpp>
+#include <mbgl/style/layer_impl.hpp>
 
 #include <string>
 #include <memory>
@@ -21,12 +23,13 @@ class DebugBucket;
 class TransformState;
 class TileObserver;
 class PlacementConfig;
+class RenderLayer;
 class RenderedQueryOptions;
 class SourceQueryOptions;
-class RenderLayer;
 
-namespace style {
-} // namespace style
+namespace gl {
+class Context;
+} // namespace gl
 
 class Tile : private util::noncopyable {
 public:
@@ -47,15 +50,18 @@ public:
     // Mark this tile as no longer needed and cancel any pending work.
     virtual void cancel() = 0;
 
-    virtual Bucket* getBucket(const RenderLayer&) const = 0;
+    virtual void upload(gl::Context&) = 0;
+    virtual Bucket* getBucket(const style::Layer::Impl&) const = 0;
 
     virtual void setPlacementConfig(const PlacementConfig&) {}
-    virtual void redoLayout() {}
+    virtual void setLayers(const std::vector<Immutable<style::Layer::Impl>>&) {}
+    virtual void setMask(TileMask&&) {}
 
     virtual void queryRenderedFeatures(
             std::unordered_map<std::string, std::vector<Feature>>& result,
             const GeometryCoordinates& queryGeometry,
             const TransformState&,
+            const std::vector<const RenderLayer*>&,
             const RenderedQueryOptions& options);
 
     virtual void querySourceFeatures(
@@ -101,6 +107,8 @@ public:
 
     // Contains the tile ID string for painting debug information.
     std::unique_ptr<DebugBucket> debugBucket;
+    
+    virtual float yStretch() const { return 1.0f; }
 
 protected:
     bool triedOptional = false;