diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-04-02 16:34:32 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-04-05 11:49:17 +0200 |
commit | 5cc3d7a73328d6df9c16d27d6aca5b49ba085351 (patch) | |
tree | 0e8b9d6938846bf12ea63b1568c96852501a68cc /platform/ios/src/MGLMapView.mm | |
parent | 4053776c27cde354acc36c27120c54427087721b (diff) | |
download | qtlocation-mapboxgl-5cc3d7a73328d6df9c16d27d6aca5b49ba085351.tar.gz |
[core] move GLContextMode to RendererBackend
Diffstat (limited to 'platform/ios/src/MGLMapView.mm')
-rw-r--r-- | platform/ios/src/MGLMapView.mm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 4cbe839179..4d980655cc 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -17,7 +17,6 @@ #include <mbgl/style/image.hpp> #include <mbgl/style/transition_options.hpp> #include <mbgl/style/layers/custom_layer.hpp> -#include <mbgl/renderer/mode.hpp> #include <mbgl/renderer/renderer.hpp> #import <mbgl/gl/renderer_backend.hpp> #import <mbgl/gl/renderable_resource.hpp> @@ -482,7 +481,7 @@ public: MGLRendererConfiguration *config = [MGLRendererConfiguration currentConfiguration]; _mbglThreadPool = mbgl::sharedThreadPool(); - auto renderer = std::make_unique<mbgl::Renderer>(*_mbglView, config.scaleFactor, *_mbglThreadPool, config.contextMode, config.cacheDir, config.localFontFamilyName); + auto renderer = std::make_unique<mbgl::Renderer>(*_mbglView, config.scaleFactor, *_mbglThreadPool, config.cacheDir, config.localFontFamilyName); BOOL enableCrossSourceCollisions = !config.perSourceCollisions; _rendererFrontend = std::make_unique<MGLRenderFrontend>(std::move(renderer), self, *_mbglView); @@ -6737,9 +6736,11 @@ class MBGLView : public mbgl::gl::RendererBackend, public mbgl::gfx::Renderable, public mbgl::MapObserver { public: - MBGLView(MGLMapView* nativeView_) : mbgl::gfx::Renderable( - nativeView_.framebufferSize, - std::make_unique<MBGLMapViewRenderable>(*this)), nativeView(nativeView_) { + MBGLView(MGLMapView* nativeView_) + : mbgl::gl::RendererBackend(mbgl::gfx::ContextMode::Unique), + mbgl::gfx::Renderable(nativeView_.framebufferSize, + std::make_unique<MBGLMapViewRenderable>(*this)), + nativeView(nativeView_) { } /// This function is called before we start rendering, when iOS invokes our rendering method. |