[core] split off render layers

1 files changed, 13 insertions, 12 deletions

diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp
index 3dcc1d5d46..9c6dd4505f 100644
--- a/src/mbgl/renderer/painter.hpp
+++ b/src/mbgl/renderer/painter.hpp
@@ -42,6 +42,13 @@ class CircleBucket;
 class SymbolBucket;
 class RasterBucket;
 
+class RenderFillLayer;
+class RenderLineLayer;
+class RenderCircleLayer;
+class RenderSymbolLayer;
+class RenderRasterLayer;
+class RenderBackgroundLayer;
+
 class Programs;
 class PaintParameters;
 
@@ -50,12 +57,6 @@ struct ClipID;
 namespace style {
 class Style;
 class Source;
-class FillLayer;
-class LineLayer;
-class CircleLayer;
-class SymbolLayer;
-class RasterLayer;
-class BackgroundLayer;
 } // namespace style
 
 struct FrameData {
@@ -80,12 +81,12 @@ public:
 
     void renderClippingMask(const UnwrappedTileID&, const ClipID&);
     void renderTileDebug(const RenderTile&);
-    void renderFill(PaintParameters&, FillBucket&, const style::FillLayer&, const RenderTile&);
-    void renderLine(PaintParameters&, LineBucket&, const style::LineLayer&, const RenderTile&);
-    void renderCircle(PaintParameters&, CircleBucket&, const style::CircleLayer&, const RenderTile&);
-    void renderSymbol(PaintParameters&, SymbolBucket&, const style::SymbolLayer&, const RenderTile&);
-    void renderRaster(PaintParameters&, RasterBucket&, const style::RasterLayer&, const RenderTile&);
-    void renderBackground(PaintParameters&, const style::BackgroundLayer&);
+    void renderFill(PaintParameters&, FillBucket&, const RenderFillLayer&, const RenderTile&);
+    void renderLine(PaintParameters&, LineBucket&, const RenderLineLayer&, const RenderTile&);
+    void renderCircle(PaintParameters&, CircleBucket&, const RenderCircleLayer&, const RenderTile&);
+    void renderSymbol(PaintParameters&, SymbolBucket&, const RenderSymbolLayer&, const RenderTile&);
+    void renderRaster(PaintParameters&, RasterBucket&, const RenderRasterLayer&, const RenderTile&);
+    void renderBackground(PaintParameters&, const RenderBackgroundLayer&);
 
 #ifndef NDEBUG
     // Renders tile clip boundaries, using stencil buffer to calculate fill color.