diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-07 23:24:52 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-08 18:37:41 +0200 |
| commit | 2144e3f3b0b8f08b65c854225d7360847633f689 (patch) | |
| tree | 16cadc63b1c3d438c5ddd4bf67aadb2e72e23130 /src/mbgl/renderer/renderer_impl.cpp | |
| parent | 2f88e8257b83b77f6c06c86c99f542976e7d5199 (diff) | |
| download | qtlocation-mapboxgl-2144e3f3b0b8f08b65c854225d7360847633f689.tar.gz | |
[core] Implement platform::Factory::sharedFileSource()upstream/map-refactor
Diffstat (limited to 'src/mbgl/renderer/renderer_impl.cpp')
| -rw-r--r-- | src/mbgl/renderer/renderer_impl.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp index bfd518c11b..2ec271a444 100644 --- a/src/mbgl/renderer/renderer_impl.cpp +++ b/src/mbgl/renderer/renderer_impl.cpp @@ -1,5 +1,6 @@ #include <mbgl/annotation/annotation_manager.hpp> #include <mbgl/layermanager/layer_manager.hpp> +#include <mbgl/platform/factory.hpp> #include <mbgl/renderer/renderer_impl.hpp> #include <mbgl/renderer/renderer_backend.hpp> #include <mbgl/renderer/renderer_observer.hpp> @@ -37,17 +38,17 @@ static RendererObserver& nullObserver() { Renderer::Impl::Impl(RendererBackend& backend_, float pixelRatio_, - FileSource& fileSource_, GLContextMode contextMode_, const optional<std::string> programCacheDir_, - const optional<std::string> localFontFamily_) + const optional<std::string> localFontFamily_, + const FileSourceOptions& fileSourceOptions) : backend(backend_) - , fileSource(fileSource_) , observer(&nullObserver()) , contextMode(contextMode_) , pixelRatio(pixelRatio_) , programCacheDir(programCacheDir_) - , glyphManager(std::make_unique<GlyphManager>(fileSource, std::make_unique<LocalGlyphRasterizer>(localFontFamily_))) + , fileSource(platform::Factory::sharedFileSource(fileSourceOptions)) + , glyphManager(std::make_unique<GlyphManager>(fileSourceOptions, std::make_unique<LocalGlyphRasterizer>(localFontFamily_))) , imageManager(std::make_unique<ImageManager>()) , lineAtlas(std::make_unique<LineAtlas>(Size{ 256, 512 })) , imageImpls(makeMutable<std::vector<Immutable<style::Image::Impl>>>()) @@ -107,9 +108,9 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) { const TileParameters tileParameters { updateParameters.pixelRatio, + fileSource, updateParameters.debugOptions, updateParameters.transformState, - fileSource, updateParameters.mode, updateParameters.annotationManager, *imageManager, |