diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-06-22 16:28:32 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-06-22 16:28:32 +0200 |
commit | d58ed6f9f33ddf13f9141c052116bec0833561a9 (patch) | |
tree | 3bb4d1e1af18256234f69929406b8b385728870f /src/mbgl/renderer/painter.cpp | |
parent | 3459b83736f0e4eedfb95a1394d9e4ee1523b917 (diff) | |
download | qtlocation-mapboxgl-d58ed6f9f33ddf13f9141c052116bec0833561a9.tar.gz |
[core] remove TexturePool dependency from Raster constructor
Diffstat (limited to 'src/mbgl/renderer/painter.cpp')
-rw-r--r-- | src/mbgl/renderer/painter.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp index 56276c26c5..2596d5cd39 100644 --- a/src/mbgl/renderer/painter.cpp +++ b/src/mbgl/renderer/painter.cpp @@ -50,9 +50,10 @@ namespace mbgl { using namespace style; -Painter::Painter(const TransformState& state_, gl::ObjectStore& store_) - : state(state_), - store(store_) { +Painter::Painter(const TransformState& state_, + gl::TexturePool& texturePool_, + gl::ObjectStore& store_) + : state(state_), texturePool(texturePool_), store(store_) { gl::debugging::enable(); plainShader = std::make_unique<PlainShader>(store); @@ -128,7 +129,7 @@ void Painter::render(const Style& style, const FrameData& frame_, SpriteAtlas& a for (const auto& item : order) { if (item.bucket && item.bucket->needsUpload()) { - item.bucket->upload(store); + item.bucket->upload(texturePool, store); } } } |