diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-09-27 17:52:14 +0200 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-27 11:03:29 -0700 |
commit | 44c7e9d05edbe6fee9e8f98b91380b6c07e57ac7 (patch) | |
tree | cb2ee7fed51efe737543bb6f2444fac885571c41 /src/mbgl/renderer/painter.hpp | |
parent | ce42d22984d19fa020e6fba77e2585c0fd9dacf4 (diff) | |
download | qtlocation-mapboxgl-44c7e9d05edbe6fee9e8f98b91380b6c07e57ac7.tar.gz |
[core] merge gl::ObjectStore into gl::Context
Diffstat (limited to 'src/mbgl/renderer/painter.hpp')
-rw-r--r-- | src/mbgl/renderer/painter.hpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index 31c840372f..6e11dd2599 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -47,10 +47,6 @@ class PaintParameters; struct ClipID; -namespace util { -class ObjectStore; -} // namespace util - namespace style { class Style; class Source; @@ -73,13 +69,15 @@ struct FrameData { class Painter : private util::noncopyable { public: - Painter(const TransformState&, gl::ObjectStore&); + Painter(const TransformState&); ~Painter(); void render(const style::Style&, const FrameData&, SpriteAtlas& annotationSpriteAtlas); + void cleanup(); + // Renders debug information for a tile. void renderTileDebug(const RenderTile&); @@ -125,7 +123,7 @@ private: float scaleDivisor, std::array<float, 2> texsize, SDFShader& sdfShader, - void (SymbolBucket::*drawSDF)(SDFShader&, gl::ObjectStore&, gl::Context&, PaintMode), + void (SymbolBucket::*drawSDF)(SDFShader&, gl::Context&, PaintMode), // Layout style::AlignmentType rotationAlignment, @@ -166,7 +164,6 @@ private: }(); const TransformState& state; - gl::ObjectStore& store; FrameData frame; |