[core] RenderTile does not expose Tile

RenderTile and Tile will be split when ochestration movces to a separate thread.

This PR improves encapsulation of Tiles management: now performed within TilePyramid.

11 files changed, 52 insertions, 0 deletions

diff --git a/src/mbgl/renderer/sources/render_custom_geometry_source.cpp b/src/mbgl/renderer/sources/render_custom_geometry_source.cpp
index 9746d84599..d0b8a70d8e 100644
--- a/src/mbgl/renderer/sources/render_custom_geometry_source.cpp
+++ b/src/mbgl/renderer/sources/render_custom_geometry_source.cpp
@@ -59,6 +59,14 @@ void RenderCustomGeometrySource::finishRender(PaintParameters& parameters) {
     tilePyramid.finishRender(parameters);
 }
 
+void RenderCustomGeometrySource::updateFadingTiles() {
+    tilePyramid.updateFadingTiles();
+}
+
+bool RenderCustomGeometrySource::hasFadingTiles() const {
+    return tilePyramid.hasFadingTiles();
+}
+
 std::vector<std::reference_wrapper<RenderTile>> RenderCustomGeometrySource::getRenderTiles() {
     return tilePyramid.getRenderTiles();
 }
diff --git a/src/mbgl/renderer/sources/render_custom_geometry_source.hpp b/src/mbgl/renderer/sources/render_custom_geometry_source.hpp
index aac6fe221b..b461d92e8b 100644
--- a/src/mbgl/renderer/sources/render_custom_geometry_source.hpp
+++ b/src/mbgl/renderer/sources/render_custom_geometry_source.hpp
@@ -21,6 +21,8 @@ public:
     void upload(gfx::UploadPass&) final;
     void prepare(const SourcePrepareParameters&) final;
     void finishRender(PaintParameters&) final;
+    void updateFadingTiles() final;
+    bool hasFadingTiles() const final;
 
     std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final;
 
diff --git a/src/mbgl/renderer/sources/render_geojson_source.cpp b/src/mbgl/renderer/sources/render_geojson_source.cpp
index c43b44934e..44d3a3a2bb 100644
--- a/src/mbgl/renderer/sources/render_geojson_source.cpp
+++ b/src/mbgl/renderer/sources/render_geojson_source.cpp
@@ -135,6 +135,14 @@ void RenderGeoJSONSource::finishRender(PaintParameters& parameters) {
     tilePyramid.finishRender(parameters);
 }
 
+void RenderGeoJSONSource::updateFadingTiles() {
+    tilePyramid.updateFadingTiles();
+}
+
+bool RenderGeoJSONSource::hasFadingTiles() const {
+    return tilePyramid.hasFadingTiles();
+}
+
 std::vector<std::reference_wrapper<RenderTile>> RenderGeoJSONSource::getRenderTiles() {
     return tilePyramid.getRenderTiles();
 }
diff --git a/src/mbgl/renderer/sources/render_geojson_source.hpp b/src/mbgl/renderer/sources/render_geojson_source.hpp
index f2b0014ac4..1ebeb045d8 100644
--- a/src/mbgl/renderer/sources/render_geojson_source.hpp
+++ b/src/mbgl/renderer/sources/render_geojson_source.hpp
@@ -26,6 +26,8 @@ public:
     void upload(gfx::UploadPass&) final;
     void prepare(const SourcePrepareParameters&) final;
     void finishRender(PaintParameters&) final;
+    void updateFadingTiles() final;
+    bool hasFadingTiles() const final;
 
     std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final;
 
diff --git a/src/mbgl/renderer/sources/render_image_source.hpp b/src/mbgl/renderer/sources/render_image_source.hpp
index 07c3005dbc..f1d3a86db1 100644
--- a/src/mbgl/renderer/sources/render_image_source.hpp
+++ b/src/mbgl/renderer/sources/render_image_source.hpp
@@ -24,6 +24,8 @@ public:
     void upload(gfx::UploadPass&) final;
     void prepare(const SourcePrepareParameters&) final;
     void finishRender(PaintParameters&) final;
+    void updateFadingTiles() final {}
+    bool hasFadingTiles() const final { return false; }
 
     void update(Immutable<style::Source::Impl>,
                 const std::vector<Immutable<style::LayerProperties>>&,
diff --git a/src/mbgl/renderer/sources/render_raster_dem_source.cpp b/src/mbgl/renderer/sources/render_raster_dem_source.cpp
index 9962e26337..afe8e060b2 100644
--- a/src/mbgl/renderer/sources/render_raster_dem_source.cpp
+++ b/src/mbgl/renderer/sources/render_raster_dem_source.cpp
@@ -139,6 +139,14 @@ void RenderRasterDEMSource::finishRender(PaintParameters& parameters) {
     tilePyramid.finishRender(parameters);
 }
 
+void RenderRasterDEMSource::updateFadingTiles() {
+    tilePyramid.updateFadingTiles();
+}
+
+bool RenderRasterDEMSource::hasFadingTiles() const {
+    return tilePyramid.hasFadingTiles();
+}
+
 std::vector<std::reference_wrapper<RenderTile>> RenderRasterDEMSource::getRenderTiles() {
     return tilePyramid.getRenderTiles();
 }
diff --git a/src/mbgl/renderer/sources/render_raster_dem_source.hpp b/src/mbgl/renderer/sources/render_raster_dem_source.hpp
index 712f4fefaa..9167fd1114 100644
--- a/src/mbgl/renderer/sources/render_raster_dem_source.hpp
+++ b/src/mbgl/renderer/sources/render_raster_dem_source.hpp
@@ -21,6 +21,8 @@ public:
     void upload(gfx::UploadPass&) final;
     void prepare(const SourcePrepareParameters&) final;
     void finishRender(PaintParameters&) final;
+    void updateFadingTiles() final;
+    bool hasFadingTiles() const final;
 
     std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final;
 
diff --git a/src/mbgl/renderer/sources/render_raster_source.cpp b/src/mbgl/renderer/sources/render_raster_source.cpp
index d7dec8ff17..db410a4e5c 100644
--- a/src/mbgl/renderer/sources/render_raster_source.cpp
+++ b/src/mbgl/renderer/sources/render_raster_source.cpp
@@ -70,6 +70,14 @@ void RenderRasterSource::finishRender(PaintParameters& parameters) {
     tilePyramid.finishRender(parameters);
 }
 
+void RenderRasterSource::updateFadingTiles() {
+    tilePyramid.updateFadingTiles();
+}
+
+bool RenderRasterSource::hasFadingTiles() const {
+    return tilePyramid.hasFadingTiles();
+}
+
 std::vector<std::reference_wrapper<RenderTile>> RenderRasterSource::getRenderTiles() {
     return tilePyramid.getRenderTiles();
 }
diff --git a/src/mbgl/renderer/sources/render_raster_source.hpp b/src/mbgl/renderer/sources/render_raster_source.hpp
index 74f81a1397..bc3bc53d35 100644
--- a/src/mbgl/renderer/sources/render_raster_source.hpp
+++ b/src/mbgl/renderer/sources/render_raster_source.hpp
@@ -21,6 +21,8 @@ public:
     void upload(gfx::UploadPass&) final;
     void prepare(const SourcePrepareParameters&) final;
     void finishRender(PaintParameters&) final;
+    void updateFadingTiles() final;
+    bool hasFadingTiles() const final;
 
     std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final;
 
diff --git a/src/mbgl/renderer/sources/render_vector_source.cpp b/src/mbgl/renderer/sources/render_vector_source.cpp
index 36fc69d988..0d5eb5c89f 100644
--- a/src/mbgl/renderer/sources/render_vector_source.cpp
+++ b/src/mbgl/renderer/sources/render_vector_source.cpp
@@ -69,6 +69,14 @@ void RenderVectorSource::finishRender(PaintParameters& parameters) {
     tilePyramid.finishRender(parameters);
 }
 
+void RenderVectorSource::updateFadingTiles() {
+    tilePyramid.updateFadingTiles();
+}
+
+bool RenderVectorSource::hasFadingTiles() const {
+    return tilePyramid.hasFadingTiles();
+}
+
 std::vector<std::reference_wrapper<RenderTile>> RenderVectorSource::getRenderTiles() {
     return tilePyramid.getRenderTiles();
 }
diff --git a/src/mbgl/renderer/sources/render_vector_source.hpp b/src/mbgl/renderer/sources/render_vector_source.hpp
index fd37e1e4fd..2eb33df91b 100644
--- a/src/mbgl/renderer/sources/render_vector_source.hpp
+++ b/src/mbgl/renderer/sources/render_vector_source.hpp
@@ -21,6 +21,8 @@ public:
     void upload(gfx::UploadPass&) final;
     void prepare(const SourcePrepareParameters&) final;
     void finishRender(PaintParameters&) final;
+    void updateFadingTiles() final;
+    bool hasFadingTiles() const final;
 
     std::vector<std::reference_wrapper<RenderTile>> getRenderTiles() final;