diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-30 13:58:59 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-05 19:38:08 -0700 |
commit | 74af076d405a089fac70a47e41fe92d04d97fc50 (patch) | |
tree | 29e4a76538da9a9455f711a25e7d5ddc1dece625 /src/mbgl/renderer/painter.hpp | |
parent | 1cf46d93b944095726396acf84649519e2fd96ad (diff) | |
download | qtlocation-mapboxgl-74af076d405a089fac70a47e41fe92d04d97fc50.tar.gz |
[core] Split RenderStyle from Style
Diffstat (limited to 'src/mbgl/renderer/painter.hpp')
-rw-r--r-- | src/mbgl/renderer/painter.hpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index e361b0f7d7..fddaff6318 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -7,6 +7,7 @@ #include <mbgl/renderer/frame_history.hpp> #include <mbgl/renderer/render_item.hpp> #include <mbgl/renderer/bucket.hpp> +#include <mbgl/renderer/render_light.hpp> #include <mbgl/gl/context.hpp> #include <mbgl/programs/debug_program.hpp> @@ -15,8 +16,6 @@ #include <mbgl/programs/extrusion_texture_program.hpp> #include <mbgl/programs/raster_program.hpp> -#include <mbgl/style/style.hpp> - #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/chrono.hpp> #include <mbgl/util/constants.hpp> @@ -29,6 +28,7 @@ namespace mbgl { +class RenderStyle; class RenderTile; class SpriteAtlas; class View; @@ -59,11 +59,6 @@ class TilePyramid; struct ClipID; -namespace style { -class Style; -class Source; -} // namespace style - struct FrameData { TimePoint timePoint; float pixelRatio; @@ -77,7 +72,7 @@ public: Painter(gl::Context&, const TransformState&, float pixelRatio, const std::string& programCacheDir); ~Painter(); - void render(const style::Style&, + void render(RenderStyle&, const FrameData&, View&); |