[core] Tile ⇢ RenderTile

6 files changed, 39 insertions, 8 deletions

diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
index 1864bf7ef1..817cf9502d 100644
--- a/src/mbgl/renderer/painter.cpp
+++ b/src/mbgl/renderer/painter.cpp
@@ -1,7 +1,7 @@
 #include <mbgl/renderer/painter.hpp>
+#include <mbgl/renderer/render_tile.hpp>
 
 #include <mbgl/style/source.hpp>
-#include <mbgl/tile/tile.hpp>
 
 #include <mbgl/platform/log.hpp>
 #include <mbgl/gl/debugging.hpp>
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp
index 65573b6594..cfffb9092b 100644
--- a/src/mbgl/renderer/painter.hpp
+++ b/src/mbgl/renderer/painter.hpp
@@ -27,7 +27,7 @@
 
 namespace mbgl {
 
-class Tile;
+class RenderTile;
 class SpriteAtlas;
 class GlyphAtlas;
 class LineAtlas;
@@ -93,7 +93,7 @@ public:
                 SpriteAtlas& annotationSpriteAtlas);
 
     // Renders debug information for a tile.
-    void renderTileDebug(const Tile& tile);
+    void renderTileDebug(const RenderTile&);
 
     // Renders the red debug frame around a tile, visualizing its perimeter.
     void renderDebugFrame(const mat4 &matrix);
diff --git a/src/mbgl/renderer/painter_debug.cpp b/src/mbgl/renderer/painter_debug.cpp
index b55a3c1628..5071b209cb 100644
--- a/src/mbgl/renderer/painter_debug.cpp
+++ b/src/mbgl/renderer/painter_debug.cpp
@@ -1,6 +1,6 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/debug_bucket.hpp>
-#include <mbgl/tile/tile.hpp>
+#include <mbgl/renderer/render_tile.hpp>
 #include <mbgl/tile/tile_data.hpp>
 #include <mbgl/shader/plain_shader.hpp>
 #include <mbgl/util/string.hpp>
@@ -11,7 +11,7 @@
 
 using namespace mbgl;
 
-void Painter::renderTileDebug(const Tile& tile) {
+void Painter::renderTileDebug(const RenderTile& tile) {
     MBGL_DEBUG_GROUP(std::string { "debug " } + util::toString(tile.id));
     if (frame.debugOptions != MapDebugOptions::NoDebug) {
         setClipping(tile.clip);
diff --git a/src/mbgl/renderer/render_item.hpp b/src/mbgl/renderer/render_item.hpp
index 6c97b66bd1..9d650606ac 100644
--- a/src/mbgl/renderer/render_item.hpp
+++ b/src/mbgl/renderer/render_item.hpp
@@ -7,7 +7,7 @@
 
 namespace mbgl {
 
-class Tile;
+class RenderTile;
 class Bucket;
 
 namespace style {
@@ -18,12 +18,12 @@ class Source;
 class RenderItem {
 public:
     RenderItem(const style::Layer& layer_,
-               const Tile* tile_ = nullptr,
+               const RenderTile* tile_ = nullptr,
                Bucket* bucket_ = nullptr)
         : tile(tile_), bucket(bucket_), layer(layer_) {
     }
 
-    const Tile* const tile;
+    const RenderTile* const tile;
     Bucket* const bucket;
     const style::Layer& layer;
 };
diff --git a/src/mbgl/renderer/render_tile.cpp b/src/mbgl/renderer/render_tile.cpp
new file mode 100644
index 0000000000..2f407a2895
--- /dev/null
+++ b/src/mbgl/renderer/render_tile.cpp
@@ -0,0 +1,3 @@
+#include <mbgl/renderer/render_tile.hpp>
+
+using namespace mbgl;
diff --git a/src/mbgl/renderer/render_tile.hpp b/src/mbgl/renderer/render_tile.hpp
new file mode 100644
index 0000000000..e2405b5359
--- /dev/null
+++ b/src/mbgl/renderer/render_tile.hpp
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <mbgl/tile/tile_id.hpp>
+#include <mbgl/util/mat4.hpp>
+#include <mbgl/util/ptr.hpp>
+#include <mbgl/util/clip_id.hpp>
+
+namespace mbgl {
+
+class TileData;
+
+class RenderTile {
+public:
+    RenderTile(const UnwrappedTileID& id_, TileData& data_) : id(id_), data(data_) {
+    }
+
+    RenderTile(const RenderTile&) = delete;
+    RenderTile(RenderTile&&) = default;
+    RenderTile& operator=(const RenderTile&) = delete;
+    RenderTile& operator=(RenderTile&&) = default;
+
+    const UnwrappedTileID id;
+    TileData& data;
+    ClipID clip;
+    mat4 matrix;
+};
+
+} // namespace mbgl