diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-13 16:24:27 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-13 17:56:44 +0200 |
commit | 8cc100bfd56955c629d5da0bc49ce2bdbae52946 (patch) | |
tree | a807cdfc906af092eb7158cd90c38834f68a55a0 /src/mbgl/renderer/renderer_impl.cpp | |
parent | 1b39f456fdab71a918427dede28f27281bd28a14 (diff) | |
download | qtlocation-mapboxgl-8cc100bfd56955c629d5da0bc49ce2bdbae52946.tar.gz |
[core] Get FileSource via UpdateParameters in Renderer::Impl
Diffstat (limited to 'src/mbgl/renderer/renderer_impl.cpp')
-rw-r--r-- | src/mbgl/renderer/renderer_impl.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp index 67e648d98b..8a9989dd51 100644 --- a/src/mbgl/renderer/renderer_impl.cpp +++ b/src/mbgl/renderer/renderer_impl.cpp @@ -37,14 +37,12 @@ static RendererObserver& nullObserver() { Renderer::Impl::Impl(RendererBackend& backend_, float pixelRatio_, - FileSource& fileSource_, Scheduler& scheduler_, GLContextMode contextMode_, const optional<std::string> programCacheDir_, const optional<std::string> localFontFamily_) : backend(backend_) , scheduler(scheduler_) - , fileSource(fileSource_) , observer(&nullObserver()) , contextMode(contextMode_) , pixelRatio(pixelRatio_) @@ -78,7 +76,7 @@ void Renderer::Impl::setObserver(RendererObserver* observer_) { void Renderer::Impl::render(const UpdateParameters& updateParameters) { if (!glyphManager) { - glyphManager = std::make_unique<GlyphManager>(fileSource, std::make_unique<LocalGlyphRasterizer>(localFontFamily)); + glyphManager = std::make_unique<GlyphManager>(updateParameters.fileSource, std::make_unique<LocalGlyphRasterizer>(localFontFamily)); glyphManager->setObserver(this); } @@ -118,7 +116,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) { updateParameters.debugOptions, updateParameters.transformState, scheduler, - fileSource, + updateParameters.fileSource, updateParameters.mode, updateParameters.annotationManager, *imageManager, |