From 5cc3d7a73328d6df9c16d27d6aca5b49ba085351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Tue, 2 Apr 2019 16:34:32 +0200
Subject: [core] move GLContextMode to RendererBackend

---
 platform/ios/src/MGLMapView.mm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'platform/ios')

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.
-- 
cgit v1.2.1