Fix CustomLayer context retain count

platform/darwin/src/MGLOpenGLStyleLayer.mm

@@ -47,7 +47,7 @@ void MGLDrawCustomStyleLayer(void *context, const mbgl::style::CustomLayerRender
     when creating an OpenGL style layer.
  */
 void MGLFinishCustomStyleLayer(void *context) {
-    MGLOpenGLStyleLayer *layer = (__bridge MGLOpenGLStyleLayer *)context;
+    MGLOpenGLStyleLayer *layer = (__bridge_transfer MGLOpenGLStyleLayer *)context;
     [layer willMoveFromMapView:layer.style.mapView];
 }
 
@@ -101,7 +101,7 @@ - (instancetype)initWithIdentifier:(NSString *)identifier {
                                                             MGLPrepareCustomStyleLayer,
                                                             MGLDrawCustomStyleLayer,
                                                             MGLFinishCustomStyleLayer,
-                                                            (__bridge void *)self);
+                                                            (__bridge_retained void *)self);
     return self = [super initWithPendingLayer:std::move(layer)];
 }
 
@@ -116,9 +116,7 @@ - (void)setStyle:(MGLStyle *)style {
         [NSException raise:@"MGLLayerReuseException"
                     format:@"%@ cannot be added to more than one MGLStyle at a time.", self];
     }
-    _style.openGLLayers[self.identifier] = nil;
     _style = style;
-    _style.openGLLayers[self.identifier] = self;
 }
 
 - (void)addToStyle:(MGLStyle *)style belowLayer:(MGLStyleLayer *)otherLayer {

platform/darwin/src/MGLStyle.mm

@@ -77,7 +77,6 @@ @interface MGLStyle()
 @property (nonatomic, readonly, weak) MGLMapView *mapView;
 @property (nonatomic, readonly) mbgl::style::Style *rawStyle;
 @property (readonly, copy, nullable) NSURL *URL;
-@property (nonatomic, readwrite, strong) NS_MUTABLE_DICTIONARY_OF(NSString *, MGLOpenGLStyleLayer *) *openGLLayers;
 @property (nonatomic) NS_MUTABLE_DICTIONARY_OF(NSString *, NS_DICTIONARY_OF(NSObject *, MGLTextLanguage *) *) *localizedLayersByIdentifier;
 
 @end
@@ -169,7 +168,6 @@ - (instancetype)initWithRawStyle:(mbgl::style::Style *)rawStyle mapView:(MGLMapV
     if (self = [super init]) {
         _mapView = mapView;
         _rawStyle = rawStyle;
-        _openGLLayers = [NSMutableDictionary dictionary];
         _localizedLayersByIdentifier = [NSMutableDictionary dictionary];
     }
     return self;

platform/darwin/src/MGLStyle_Private.h

@@ -26,8 +26,6 @@ namespace mbgl {
 
 - (nullable NS_ARRAY_OF(MGLAttributionInfo *) *)attributionInfosWithFontSize:(CGFloat)fontSize linkColor:(nullable MGLColor *)linkColor;
 
-@property (nonatomic, readonly, strong) NS_MUTABLE_DICTIONARY_OF(NSString *, MGLOpenGLStyleLayer *) *openGLLayers;
-
 - (void)setStyleClasses:(NS_ARRAY_OF(NSString *) *)appliedClasses transitionDuration:(NSTimeInterval)transitionDuration;
 
 @end

src/mbgl/renderer/layers/render_custom_layer.cpp

@@ -43,20 +43,25 @@ std::unique_ptr<Bucket> RenderCustomLayer::createBucket(const BucketParameters&,
 }
 
 void RenderCustomLayer::render(PaintParameters& paintParameters, RenderSource*) {
-    if (!initialized) {
+    if (context != impl().context || !initialized) {
+        //If the context changed, deinitialize the previous one before initializing the new one.
+        if (context && !contextDestroyed && impl().deinitializeFn) {
+            impl().deinitializeFn(context);
+        }
+        context = impl().context;
         assert(impl().initializeFn);
         impl().initializeFn(impl().context);
         initialized = true;
     }
 
-    gl::Context& context = paintParameters.context;
+    gl::Context& glContext = paintParameters.context;
     const TransformState& state = paintParameters.state;
 
     // Reset GL state to a known state so the CustomLayer always has a clean slate.
-    context.bindVertexArray = 0;
-    context.setDepthMode(paintParameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly));
-    context.setStencilMode(gl::StencilMode::disabled());
-    context.setColorMode(paintParameters.colorModeForRenderPass());
+    glContext.bindVertexArray = 0;
+    glContext.setDepthMode(paintParameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly));
+    glContext.setStencilMode(gl::StencilMode::disabled());
+    glContext.setColorMode(paintParameters.colorModeForRenderPass());
 
     CustomLayerRenderParameters parameters;
 
@@ -70,12 +75,12 @@ void RenderCustomLayer::render(PaintParameters& paintParameters, RenderSource*)
     parameters.fieldOfView = state.getFieldOfView();
 
     assert(impl().renderFn);
-    impl().renderFn(impl().context, parameters);
+    impl().renderFn(context, parameters);
 
     // Reset the view back to our original one, just in case the CustomLayer changed
     // the viewport or Framebuffer.
     paintParameters.backend.bind();
-    context.setDirtyState();
+    glContext.setDirtyState();
 }
 
 } // namespace mbgl

src/mbgl/renderer/layers/render_custom_layer.hpp

@@ -26,6 +26,7 @@ class RenderCustomLayer: public RenderLayer {
 private:
     bool initialized = false;
     bool contextDestroyed = false;
+    void * context = nullptr;
 };
 
 template <>