expo-gl 15.0.0 → 15.0.2

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 15.0.2 — 2024-11-14
+
+_This version does not introduce any user-facing changes._
+
+## 15.0.1 — 2024-11-07
+
+### 🐛 Bug fixes
+
+- Converted the native view from Objective-C to Swift to fix support for the New Architecture. ([#32675](https://github.com/expo/expo/pull/32675) by [@tsapeta](https://github.com/tsapeta))
+
 ## 15.0.0 — 2024-10-22
 
 ### 🛠 Breaking changes

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '15.0.0'
+version = '15.0.2'
 
 def reactNativeArchitectures() {
     def value = project.getProperties().get("reactNativeArchitectures")
@@ -26,7 +26,7 @@ android {
   namespace "expo.modules.gl"
   defaultConfig {
     versionCode 31
-    versionName "15.0.0"
+    versionName "15.0.2"
 
     externalNativeBuild {
       cmake {

package/ios/EXGLContext.h

@@ -17,12 +17,11 @@
 
 @interface EXGLContext : NSObject
 
-- (nullable instancetype)initWithDelegate:(nullable id<EXGLContextDelegate>)delegate
-                        andModuleRegistry:(nonnull EXModuleRegistry *)moduleRegistry;
-- (void)initialize;
+- (nonnull instancetype)initWithDelegate:(nullable id<EXGLContextDelegate>)delegate
+                       andModuleRegistry:(nonnull EXModuleRegistry *)moduleRegistry;
 - (void)prepare:(nullable void(^)(BOOL))callback andEnableExperimentalWorkletSupport:(BOOL)enableExperimentalWorkletSupport;
 - (BOOL)isInitialized;
-- (nullable EAGLContext *)createSharedEAGLContext;
+- (nonnull EAGLContext *)createSharedEAGLContext;
 - (void)runAsync:(nonnull void(^)(void))callback;
 - (void)runInEAGLContext:(nonnull EAGLContext*)context callback:(nonnull void(^)(void))callback;
 - (void)takeSnapshotWithOptions:(nonnull NSDictionary *)options resolve:(nonnull EXPromiseResolveBlock)resolve reject:(nonnull EXPromiseRejectBlock)reject;

package/ios/EXGLContext.mm

@@ -26,8 +26,8 @@
 
 @implementation EXGLContext
 
-- (instancetype)initWithDelegate:(id<EXGLContextDelegate>)delegate
-               andModuleRegistry:(nonnull EXModuleRegistry *)moduleRegistry
+- (nonnull instancetype)initWithDelegate:(id<EXGLContextDelegate>)delegate
+                       andModuleRegistry:(nonnull EXModuleRegistry *)moduleRegistry
 {
   if (self = [super init]) {
     self.delegate = delegate;
@@ -39,6 +39,8 @@
     _isContextReady = NO;
     _wasPrepareCalled = NO;
     _appIsBackgrounded = NO;
+
+    [self initialize];
   }
   return self;
 }
@@ -48,7 +50,7 @@
   return _isContextReady;
 }
 
-- (EAGLContext *)createSharedEAGLContext
+- (nonnull EAGLContext *)createSharedEAGLContext
 {
   return [[EAGLContext alloc] initWithAPI:[_eaglCtx API] sharegroup:[_eaglCtx sharegroup]];
 }

package/ios/EXGLObjectManager.mm

@@ -6,7 +6,6 @@
 
 #import <ExpoGL/EXGLObjectManager.h>
 #import <ExpoGL/EXGLObject.h>
-#import <ExpoGL/EXGLView.h>
 #import <ExpoGL/EXGLCameraObject.h>
 
 @interface EXGLObjectManager ()
@@ -99,7 +98,6 @@ EX_EXPORT_METHOD_AS(createContextAsync,
   EXGLContext *glContext = [[EXGLContext alloc] initWithDelegate:nil
                                                andModuleRegistry:_moduleRegistry];
 
-  [glContext initialize];
   [glContext prepare:^(BOOL success) {
     if (success) {
       resolve(@{ @"exglCtxId": @(glContext.contextId) });
@@ -150,7 +148,7 @@ EX_EXPORT_METHOD_AS(createCameraTextureAsync,
     id<EXCameraInterface> cameraView = (id<EXCameraInterface>)view;
 
     if (glContext == nil) {
-      reject(@"E_GL_BAD_VIEW_TAG", nil, EXErrorWithMessage(@"ExponentGLObjectManager.createCameraTextureAsync: Expected an EXGLView"));
+      reject(@"E_GL_BAD_VIEW_TAG", nil, EXErrorWithMessage(@"ExponentGLObjectManager.createCameraTextureAsync: Expected a GLView"));
       return;
     }
     if (cameraView == nil) {

package/ios/GLView.swift

@@ -0,0 +1,329 @@
+// Copyright 2024-present 650 Industries. All rights reserved.
+
+import ExpoModulesCore
+
+internal final class GLView: ExpoView, EXGLContextDelegate {
+  lazy var glContext: EXGLContext = {
+    guard let legacyModuleRegistry = appContext?.legacyModuleRegistry else {
+      fatalError("Legacy module registry is not available")
+    }
+    return EXGLContext(delegate: self, andModuleRegistry: legacyModuleRegistry)
+  }()
+
+  lazy var eaglContext: EAGLContext = glContext.createSharedEAGLContext()
+
+  // Props
+  var msaaSamples: Int = 0
+  var enableExperimentalWorkletSupport: Bool = false
+
+  // Events
+  var onSurfaceCreate: EventDispatcher? = EventDispatcher()
+
+  // GL
+  var layerWidth: GLint = 0
+  var layerHeight: GLint = 0
+  var viewFramebuffer: GLuint = 0
+  var viewColorbuffer: GLuint = 0
+  var viewDepthStencilbuffer: GLuint = 0
+  var msaaFramebuffer: GLuint = 0
+  var msaaRenderbuffer: GLuint = 0
+
+  var displayLink: CADisplayLink?
+  var isAfterLayout: Bool = false
+  var isRenderbufferPresented: Bool = true
+  var viewBuffersSize: CGSize = .zero
+
+  override static var layerClass: AnyClass {
+    return CAEAGLLayer.self
+  }
+
+  required init(appContext: AppContext? = nil) {
+    super.init(appContext: appContext)
+
+    // Set up a draw loop
+    displayLink = CADisplayLink(target: self, selector: #selector(drawGL))
+    displayLink?.add(to: RunLoop.main, forMode: .common)
+
+    contentScaleFactor = EXUtilities.screenScale()
+
+    // Initialize properties of our backing CAEAGLLayer
+    if let eaglLayer = layer as? CAEAGLLayer {
+      eaglLayer.isOpaque = false
+      eaglLayer.drawableProperties = [
+        kEAGLDrawablePropertyRetainedBacking: false,
+        kEAGLDrawablePropertyColorFormat: kEAGLColorFormatRGBA8
+      ]
+    }
+  }
+
+  func runOnUIThread(_ callback: @escaping () -> Void) {
+    DispatchQueue.main.sync {
+      glContext.run(in: self.eaglContext, callback: callback)
+    }
+  }
+
+  // MARK: - UIView
+
+  override func layoutSubviews() {
+    resizeViewBuffersToWidth(width: contentScaleFactor * frame.size.width, height: contentScaleFactor * frame.size.height)
+
+    isAfterLayout = true
+    glContext.prepare(nil, andEnableExperimentalWorkletSupport: enableExperimentalWorkletSupport)
+    maybeCallSurfaceCreated()
+  }
+
+  override func removeFromSuperview() {
+    glContext.destroy()
+    displayLink?.invalidate()
+    displayLink = nil
+    super.removeFromSuperview()
+  }
+
+  // MARK: - GL
+
+  func resizeViewBuffersToWidth(width: Double, height: Double) {
+    let newViewBuffersSize = CGSize(width: width, height: height)
+
+    // Don't resize if size hasn't changed and the current size is not zero
+    if CGSizeEqualToSize(newViewBuffersSize, viewBuffersSize) && !CGSizeEqualToSize(viewBuffersSize, .zero) {
+      return
+    }
+
+    // update viewBuffersSize on UI thread (before actual resize takes place)
+    // to get rid of redundant resizes if layoutSubviews is called multiple times with the same frame size
+    viewBuffersSize = newViewBuffersSize
+
+    // swiftlint:disable:next closure_body_length
+    glContext.runAsync { [self] in
+      // Save surrounding framebuffer/renderbuffer
+      var prevFramebuffer: GLuint = 0
+      var prevRenderbuffer: GLuint = 0
+
+      glGetIntegerv(GLenum(GL_FRAMEBUFFER_BINDING), &prevFramebuffer)
+      glGetIntegerv(GLenum(GL_RENDERBUFFER_BINDING), &prevRenderbuffer)
+      if prevFramebuffer == viewFramebuffer {
+        prevFramebuffer = 0
+      }
+
+      // Delete old buffers if they exist
+      deleteViewBuffers()
+
+      // Set up view framebuffer
+      glGenFramebuffers(1, &viewFramebuffer)
+      glBindFramebuffer(GLenum(GL_FRAMEBUFFER), viewFramebuffer)
+
+      // Set up new color renderbuffer
+      glGenRenderbuffers(1, &viewColorbuffer)
+      glBindRenderbuffer(GLenum(GL_RENDERBUFFER), viewColorbuffer)
+
+      runOnUIThread { [self] in
+        glBindRenderbuffer(GLenum(GL_RENDERBUFFER), viewColorbuffer)
+        eaglContext.renderbufferStorage(Int(GL_RENDERBUFFER), from: self.layer as? CAEAGLLayer)
+      }
+
+      glFramebufferRenderbuffer(
+        GLenum(GL_FRAMEBUFFER),
+        GLenum(GL_COLOR_ATTACHMENT0),
+        GLenum(GL_RENDERBUFFER),
+        viewColorbuffer
+      )
+      glGetRenderbufferParameteriv(
+        GLenum(GL_RENDERBUFFER),
+        GLenum(GL_RENDERBUFFER_WIDTH),
+        &layerWidth
+      )
+      glGetRenderbufferParameteriv(
+        GLenum(GL_RENDERBUFFER),
+        GLenum(GL_RENDERBUFFER_HEIGHT),
+        &layerHeight
+      )
+
+      // Set up MSAA framebuffer/renderbuffer
+      glGenFramebuffers(1, &msaaFramebuffer)
+      glGenRenderbuffers(1, &msaaRenderbuffer)
+      glBindFramebuffer(GLenum(GL_FRAMEBUFFER), msaaFramebuffer)
+      glBindRenderbuffer(GLenum(GL_RENDERBUFFER), msaaRenderbuffer)
+      glRenderbufferStorageMultisample(
+        GLenum(GL_RENDERBUFFER),
+        GLsizei(msaaSamples),
+        GLenum(GL_RGBA8),
+        layerWidth,
+        layerHeight
+      )
+      glFramebufferRenderbuffer(
+        GLenum(GL_FRAMEBUFFER),
+        GLenum(GL_COLOR_ATTACHMENT0),
+        GLenum(GL_RENDERBUFFER),
+        msaaRenderbuffer
+      )
+
+      EXGLContextSetDefaultFramebuffer(glContext.contextId, GLint(msaaFramebuffer))
+
+      // Set up new depth+stencil renderbuffer
+      glGenRenderbuffers(1, &viewDepthStencilbuffer)
+      glBindRenderbuffer(GLenum(GL_RENDERBUFFER), viewDepthStencilbuffer)
+      glRenderbufferStorageMultisample(
+        GLenum(GL_RENDERBUFFER),
+        GLsizei(msaaSamples),
+        GLenum(GL_DEPTH24_STENCIL8),
+        layerWidth,
+        layerHeight
+      )
+      glFramebufferRenderbuffer(
+        GLenum(GL_FRAMEBUFFER),
+        GLenum(GL_DEPTH_ATTACHMENT),
+        GLenum(GL_RENDERBUFFER),
+        viewDepthStencilbuffer
+      )
+      glFramebufferRenderbuffer(
+        GLenum(GL_FRAMEBUFFER),
+        GLenum(GL_STENCIL_ATTACHMENT),
+        GLenum(GL_RENDERBUFFER),
+        viewDepthStencilbuffer
+      )
+
+      // Resize viewport
+      glViewport(0, 0, GLsizei(width), GLsizei(height))
+
+      // Restore surrounding framebuffer/renderbuffer
+      if prevFramebuffer != 0 {
+        glBindFramebuffer(GLenum(GL_FRAMEBUFFER), prevFramebuffer)
+      }
+      glBindRenderbuffer(GLenum(GL_RENDERBUFFER), prevRenderbuffer)
+    }
+  }
+
+  func maybeCallSurfaceCreated() {
+    // Because initialization things happen asynchronously,
+    // we need to be sure that they all are done before we pass GL object to JS.
+
+    if onSurfaceCreate != nil && glContext.isInitialized() && isAfterLayout {
+      onSurfaceCreate?([
+        "exglCtxId": glContext.contextId
+      ])
+
+      // unset onSurfaceCreate - it will not be needed anymore
+      onSurfaceCreate = nil
+    }
+  }
+
+  @objc
+  func drawGL() {
+    // exglCtxId may be unset if we get here (on the UI thread) before EXGLContextCreate(...) is
+    // called on the JS thread to create the EXGL context and save its id (see EXGLContext.initializeContextWithBridge method).
+    // In this case no GL work has been sent yet so we skip this frame.
+    //
+    // _viewFramebuffer may be 0 if we haven't had a layout event yet and so the size of the
+    // framebuffer to create is unknown. In this case we have nowhere to render to so we skip
+    // this frame (the GL work to run remains on the queue for next time).
+
+    if glContext.isInitialized() && viewFramebuffer != 0 {
+      // Present current state of view buffers
+      // This happens exactly at `gl.endFrameEXP()` in the queue
+      if viewColorbuffer != 0 && !isRenderbufferPresented {
+        // bind renderbuffer and present it on the layer
+        glContext.runAsync {
+          glBindRenderbuffer(GLenum(GL_RENDERBUFFER), self.viewColorbuffer)
+          self.eaglContext.presentRenderbuffer(Int(GL_RENDERBUFFER))
+        }
+
+        // mark renderbuffer as presented
+        isRenderbufferPresented = true
+      }
+    }
+  }
+
+  // [GL thread] blits framebuffers and then sets a flag that informs UI thread
+  // about presenting the new content of the renderbuffer on the next draw call
+  func blitFramebuffers() {
+    if glContext.isInitialized() && viewFramebuffer != 0 && viewColorbuffer != 0 {
+      // Save surrounding framebuffer
+      var prevFramebuffer: GLuint = 0
+      glGetIntegerv(GLenum(GL_FRAMEBUFFER_BINDING), &prevFramebuffer)
+      if prevFramebuffer == viewFramebuffer {
+        prevFramebuffer = 0
+      }
+
+      // Resolve multisampling and present
+      glBindFramebuffer(GLenum(GL_READ_FRAMEBUFFER), msaaFramebuffer)
+      glBindFramebuffer(GLenum(GL_DRAW_FRAMEBUFFER), viewFramebuffer)
+
+      // glBlitFramebuffer works only on OpenGL ES 3.0, so we need a fallback to Apple's extension for OpenGL ES 2.0
+      if glContext.eaglCtx.api == .openGLES3 {
+        glBlitFramebuffer(
+          0,
+          0,
+          layerWidth,
+          layerHeight,
+          0,
+          0,
+          layerWidth,
+          layerHeight,
+          GLbitfield(GL_COLOR_BUFFER_BIT),
+          GLenum(GL_NEAREST)
+        )
+      } else {
+        glResolveMultisampleFramebufferAPPLE()
+      }
+
+      // Restore surrounding framebuffer
+      if prevFramebuffer != 0 {
+        glBindFramebuffer(GLenum(GL_FRAMEBUFFER), prevFramebuffer)
+      }
+
+      // mark renderbuffer as not presented
+      isRenderbufferPresented = false
+    }
+  }
+
+  func deleteViewBuffers() {
+    if viewDepthStencilbuffer != 0 {
+      glDeleteRenderbuffers(1, &viewDepthStencilbuffer)
+      viewDepthStencilbuffer = 0
+    }
+    if viewColorbuffer != 0 {
+      glDeleteRenderbuffers(1, &viewColorbuffer)
+      viewColorbuffer = 0
+    }
+    if viewFramebuffer != 0 {
+      glDeleteFramebuffers(1, &viewFramebuffer)
+      viewFramebuffer = 0
+    }
+    if msaaRenderbuffer != 0 {
+      glDeleteRenderbuffers(1, &msaaRenderbuffer)
+      msaaRenderbuffer = 0
+    }
+    if msaaFramebuffer != 0 {
+      glDeleteFramebuffers(1, &msaaFramebuffer)
+      msaaFramebuffer = 0
+    }
+  }
+
+  // MARK: - EXGLContextDelegate
+
+  // [GL thread]
+  func glContextFlushed(_ context: EXGLContext) {
+    // blit framebuffers if endFrameEXP was called
+    if EXGLContextNeedsRedraw(glContext.contextId) {
+      // actually draw isn't yet finished, but it's here to prevent blitting the same thing multiple times
+      EXGLContextDrawEnded(glContext.contextId)
+
+      blitFramebuffers()
+    }
+  }
+
+  // [JS thread]
+  func glContextInitialized(_ context: EXGLContext) {
+    maybeCallSurfaceCreated()
+  }
+
+  // [GL thread]
+  func glContextWillDestroy(_ context: EXGLContext) {
+    // Destroy GL objects owned by us
+    deleteViewBuffers()
+  }
+
+  func glContextGetDefaultFramebuffer() -> EXGLObjectId {
+    return msaaFramebuffer
+  }
+}

package/ios/GLViewModule.swift

@@ -6,7 +6,7 @@ public final class GLViewModule: Module {
   public func definition() -> ModuleDefinition {
     Name("ExponentGLView")
 
-    View(EXGLView.self) {
+    View(GLView.self) {
       Events("onSurfaceCreate")
 
       Prop("msaaSamples") { (view, msaaSamples: Int) in

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gl",
-  "version": "15.0.0",
+  "version": "15.0.2",
   "description": "Provides GLView that acts as OpenGL ES render target and gives GL context object implementing WebGL 2.0 specification.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -57,5 +57,5 @@
       "optional": true
     }
   },
-  "gitHead": "7c7d2362fff23bec26cd145ed34edd9c403551bd"
+  "gitHead": "b7b95a93855cb4863b626c4524fc6e8b3a2305eb"
 }

package/ios/EXGLView.h

@@ -1,28 +0,0 @@
-// Copyright 2016-present 650 Industries. All rights reserved.
-
-#import <ExpoGL/EXGLNativeApi.h>
-#import <ExpoGL/EXGLContext.h>
-#import <ExpoModulesCore/EXModuleRegistry.h>
-#import <ExpoModulesCore/EXLegacyExpoViewProtocol.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface EXGLView : UIView <EXGLContextDelegate, EXLegacyExpoViewProtocol>
-
-- (EXGLContextId)exglCtxId;
-
-// AR
-- (void)setArSessionManager:(id)arSessionManager;
-- (void)maybeStopARSession;
-
-@property (nonatomic, copy, nullable) EXDirectEventBlock onSurfaceCreate;
-@property (nonatomic, assign) NSInteger msaaSamples;
-@property (nonatomic, assign) BOOL enableExperimentalWorkletSupport;
-
-// "protected"
-@property (nonatomic, strong, nullable) EXGLContext *glContext;
-@property (nonatomic, strong, nullable) EAGLContext *uiEaglCtx;
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/EXGLView.mm

@@ -1,343 +0,0 @@
-// Copyright 2016-present 650 Industries. All rights reserved.
-
-#import <ExpoModulesCore/EXUtilities.h>
-#import <ExpoGL/EXGLView.h>
-#import <ExpoGL/EXGLContext.h>
-
-#include <OpenGLES/ES2/glext.h>
-#include <OpenGLES/ES3/gl.h>
-#include <OpenGLES/ES3/glext.h>
-
-#define STRINGIZE(x) #x
-#define STRINGIZE2(x) STRINGIZE(x)
-#define SHADER_STRING(text) @ STRINGIZE2(text)
-
-@interface EXGLView ()
-
-@property (nonatomic, assign) GLint layerWidth;
-@property (nonatomic, assign) GLint layerHeight;
-@property (nonatomic, assign) GLuint viewFramebuffer;
-@property (nonatomic, assign) GLuint viewColorbuffer;
-@property (nonatomic, assign) GLuint viewDepthStencilbuffer;
-@property (nonatomic, assign) GLuint msaaFramebuffer;
-@property (nonatomic, assign) GLuint msaaRenderbuffer;
-@property (nonatomic, strong) dispatch_queue_t glQueue;
-
-@property (nonatomic, strong) CADisplayLink *displayLink;
-
-@property (nonatomic, assign) BOOL isLayouted;
-@property (nonatomic, assign) BOOL renderbufferPresented;
-@property (nonatomic, assign) CGSize viewBuffersSize;
-
-@property (nonatomic, weak) id arSessionManager;
-
-@end
-
-@implementation EXGLView
-
-// Specify that we want this UIView to be backed by a CAEAGLLayer
-+ (Class)layerClass {
-  return [CAEAGLLayer class];
-}
-
-- (instancetype)initWithModuleRegistry:(EXModuleRegistry *)moduleRegistry
-{
-  if ((self = [super init])) {
-    _isLayouted = NO;
-    _renderbufferPresented = YES;
-    _viewBuffersSize = CGSizeZero;
-
-    self.contentScaleFactor = [EXUtilities screenScale];
-
-    // Initialize properties of our backing CAEAGLLayer
-    CAEAGLLayer *eaglLayer = (CAEAGLLayer *) self.layer;
-    eaglLayer.opaque = YES;
-    eaglLayer.drawableProperties = @{
-      kEAGLDrawablePropertyRetainedBacking: @(YES),
-      kEAGLDrawablePropertyColorFormat: kEAGLColorFormatRGBA8,
-    };
-
-    // Initialize GL context
-    _glContext = [[EXGLContext alloc] initWithDelegate:self andModuleRegistry:moduleRegistry];
-    _uiEaglCtx = [_glContext createSharedEAGLContext];
-    [_glContext initialize];
-
-    // View buffers will be created on layout event
-    _msaaFramebuffer = _msaaRenderbuffer = _viewFramebuffer = _viewColorbuffer = _viewDepthStencilbuffer = 0;
-
-    // Set up a draw loop
-    _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(draw)];
-    //    _displayLink.preferredFramesPerSecond = 60;
-    [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
-  }
-  return self;
-}
-
-- (EXGLContextId)exglCtxId
-{
-  return [_glContext contextId];
-}
-
-- (void)maybeCallSurfaceCreated
-{
-  // Because initialization things happen asynchronously,
-  // we need to be sure that they all are done before we pass GL object to JS.
-
-  if (_onSurfaceCreate && _glContext.isInitialized && _isLayouted) {
-    EXGLContextId exglCtxId = _glContext.contextId;
-    _onSurfaceCreate(@{ @"exglCtxId": @(exglCtxId) });
-
-    // unset onSurfaceCreate - it will not be needed anymore
-    _onSurfaceCreate = nil;
-  }
-}
-
-- (void)layoutSubviews
-{
-  [self resizeViewBuffersToWidth:self.contentScaleFactor * self.frame.size.width
-                          height:self.contentScaleFactor * self.frame.size.height];
-
-  _isLayouted = YES;
-  [_glContext prepare:nil andEnableExperimentalWorkletSupport:self.enableExperimentalWorkletSupport];
-  [self maybeCallSurfaceCreated];
-}
-
-- (void)setOnSurfaceCreate:(EXDirectEventBlock)onSurfaceCreate
-{
-  _onSurfaceCreate = onSurfaceCreate;
-  [self maybeCallSurfaceCreated];
-}
-
-- (void)runOnUIThread:(void(^)(void))callback
-{
-  dispatch_sync(dispatch_get_main_queue(), ^{
-    [self->_glContext runInEAGLContext:self->_uiEaglCtx callback:callback];
-  });
-}
-
-- (void)deleteViewBuffers
-{
-  if (_viewDepthStencilbuffer != 0) {
-    glDeleteRenderbuffers(1, &_viewDepthStencilbuffer);
-    _viewDepthStencilbuffer = 0;
-  }
-  if (_viewColorbuffer != 0) {
-    glDeleteRenderbuffers(1, &_viewColorbuffer);
-    _viewColorbuffer = 0;
-  }
-  if (_viewFramebuffer != 0) {
-    glDeleteFramebuffers(1, &_viewFramebuffer);
-    _viewFramebuffer = 0;
-  }
-  if (_msaaRenderbuffer != 0) {
-    glDeleteRenderbuffers(1, &_msaaRenderbuffer);
-    _msaaRenderbuffer = 0;
-  }
-  if (_msaaFramebuffer != 0) {
-    glDeleteFramebuffers(1, &_msaaFramebuffer);
-    _msaaFramebuffer = 0;
-  }
-}
-
-- (void)resizeViewBuffersToWidth:(short)width height:(short)height
-{
-  CGSize newViewBuffersSize = CGSizeMake(width, height);
-
-  // Don't resize if size hasn't changed and the current size is not zero
-  if (CGSizeEqualToSize(newViewBuffersSize, _viewBuffersSize) && !CGSizeEqualToSize(_viewBuffersSize, CGSizeZero)) {
-    return;
-  }
-
-  // update viewBuffersSize on UI thread (before actual resize takes place)
-  // to get rid of redundant resizes if layoutSubviews is called multiple times with the same frame size
-  _viewBuffersSize = newViewBuffersSize;
-
-  [_glContext runAsync:^{
-    // Save surrounding framebuffer/renderbuffer
-    GLint prevFramebuffer;
-    GLint prevRenderbuffer;
-    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &prevFramebuffer);
-    glGetIntegerv(GL_RENDERBUFFER_BINDING, &prevRenderbuffer);
-    if (prevFramebuffer == self->_viewFramebuffer) {
-      prevFramebuffer = 0;
-    }
-
-    // Delete old buffers if they exist
-    [self deleteViewBuffers];
-
-    // Set up view framebuffer
-    glGenFramebuffers(1, &self->_viewFramebuffer);
-    glBindFramebuffer(GL_FRAMEBUFFER, self->_viewFramebuffer);
-
-    // Set up new color renderbuffer
-    glGenRenderbuffers(1, &self->_viewColorbuffer);
-    glBindRenderbuffer(GL_RENDERBUFFER, self->_viewColorbuffer);
-
-    [self runOnUIThread:^{
-      glBindRenderbuffer(GL_RENDERBUFFER, self->_viewColorbuffer);
-      [self->_uiEaglCtx renderbufferStorage:GL_RENDERBUFFER fromDrawable:(CAEAGLLayer *)self.layer];
-    }];
-
-    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                              GL_RENDERBUFFER, self->_viewColorbuffer);
-    glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_WIDTH, &self->_layerWidth);
-    glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_HEIGHT, &self->_layerHeight);
-
-    // Set up MSAA framebuffer/renderbuffer
-    glGenFramebuffers(1, &self->_msaaFramebuffer);
-    glGenRenderbuffers(1, &self->_msaaRenderbuffer);
-    glBindFramebuffer(GL_FRAMEBUFFER, self->_msaaFramebuffer);
-    glBindRenderbuffer(GL_RENDERBUFFER, self->_msaaRenderbuffer);
-    glRenderbufferStorageMultisample(GL_RENDERBUFFER, self.msaaSamples, GL_RGBA8,
-                                     self->_layerWidth, self->_layerHeight);
-    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                              GL_RENDERBUFFER, self->_msaaRenderbuffer);
-
-    EXGLContextSetDefaultFramebuffer(self->_glContext.contextId, self->_msaaFramebuffer);
-
-    // Set up new depth+stencil renderbuffer
-    glGenRenderbuffers(1, &self->_viewDepthStencilbuffer);
-    glBindRenderbuffer(GL_RENDERBUFFER, self->_viewDepthStencilbuffer);
-    glRenderbufferStorageMultisample(GL_RENDERBUFFER, self.msaaSamples, GL_DEPTH24_STENCIL8,
-                                     self->_layerWidth, self->_layerHeight);
-    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-                              GL_RENDERBUFFER, self->_viewDepthStencilbuffer);
-    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
-                              GL_RENDERBUFFER, self->_viewDepthStencilbuffer);
-
-    // Resize viewport
-    glViewport(0, 0, width, height);
-
-    // Restore surrounding framebuffer/renderbuffer
-    if (prevFramebuffer != 0) {
-      glBindFramebuffer(GL_FRAMEBUFFER, prevFramebuffer);
-    }
-    glBindRenderbuffer(GL_RENDERBUFFER, prevRenderbuffer);
-
-    // TODO(nikki): Notify JS component of resize
-  }];
-}
-
-// TODO(nikki): Should all this be done in `dealloc` instead?
-- (void)removeFromSuperview
-{
-  // Destroy EXGLContext
-  [_glContext destroy];
-
-  // Stop draw loop
-  [_displayLink invalidate];
-  _displayLink = nil;
-
-  [super removeFromSuperview];
-}
-
-- (void)draw
-{
-  // exglCtxId may be unset if we get here (on the UI thread) before EXGLContextCreate(...) is
-  // called on the JS thread to create the EXGL context and save its id (see EXGLContext.initializeContextWithBridge method).
-  // In this case no GL work has been sent yet so we skip this frame.
-  //
-  // _viewFramebuffer may be 0 if we haven't had a layout event yet and so the size of the
-  // framebuffer to create is unknown. In this case we have nowhere to render to so we skip
-  // this frame (the GL work to run remains on the queue for next time).
-
-  if (_glContext.isInitialized && _viewFramebuffer != 0) {
-    // Present current state of view buffers
-    // This happens exactly at `gl.endFrameEXP()` in the queue
-    if (_viewColorbuffer != 0 && !_renderbufferPresented) {
-      // bind renderbuffer and present it on the layer
-      [_glContext runAsync:^{
-        glBindRenderbuffer(GL_RENDERBUFFER, self->_viewColorbuffer);
-        [self->_uiEaglCtx presentRenderbuffer:GL_RENDERBUFFER];
-      }];
-
-      // mark renderbuffer as presented
-      _renderbufferPresented = YES;
-    }
-  }
-}
-
-// [GL thread] blits framebuffers and then sets a flag that informs UI thread
-// about presenting the new content of the renderbuffer on the next draw call
-- (void)blitFramebuffers
-{
-  if (_glContext.isInitialized && _viewFramebuffer != 0 && _viewColorbuffer != 0) {
-    // Save surrounding framebuffer
-    GLint prevFramebuffer;
-    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &prevFramebuffer);
-    if (prevFramebuffer == _viewFramebuffer) {
-      prevFramebuffer = 0;
-    }
-
-    // Resolve multisampling and present
-    glBindFramebuffer(GL_READ_FRAMEBUFFER, _msaaFramebuffer);
-    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _viewFramebuffer);
-
-    // glBlitFramebuffer works only on OpenGL ES 3.0, so we need a fallback to Apple's extension for OpenGL ES 2.0
-    if (_glContext.eaglCtx.API == kEAGLRenderingAPIOpenGLES3) {
-      glBlitFramebuffer(0, 0, _layerWidth, _layerHeight, 0, 0, _layerWidth, _layerHeight, GL_COLOR_BUFFER_BIT, GL_NEAREST);
-    } else {
-      glResolveMultisampleFramebufferAPPLE();
-    }
-
-    // Restore surrounding framebuffer
-    if (prevFramebuffer != 0) {
-      glBindFramebuffer(GL_FRAMEBUFFER, prevFramebuffer);
-    }
-
-    // mark renderbuffer as not presented
-    _renderbufferPresented = NO;
-  }
-}
-
-#pragma mark - EXGLContextDelegate
-
-// [GL thread]
-- (void)glContextFlushed:(nonnull EXGLContext *)context
-{
-  // blit framebuffers if endFrameEXP was called
-  if (EXGLContextNeedsRedraw(_glContext.contextId)) {
-    // actually draw isn't yet finished, but it's here to prevent blitting the same thing multiple times
-    EXGLContextDrawEnded(_glContext.contextId);
-
-    [self blitFramebuffers];
-  }
-}
-
-// [JS thread]
-- (void)glContextInitialized:(nonnull EXGLContext *)context
-{
-  [self maybeCallSurfaceCreated];
-}
-
-// [GL thread]
-- (void)glContextWillDestroy:(nonnull EXGLContext *)context
-{
-  // Stop AR session if running
-  [self maybeStopARSession];
-
-  // Destroy GL objects owned by us
-  [self deleteViewBuffers];
-}
-
-- (EXGLObjectId)glContextGetDefaultFramebuffer
-{
-  return _msaaFramebuffer;
-}
-
-#pragma mark - maybe AR
-
-- (void)setArSessionManager:(id)arSessionManager
-{
-  _arSessionManager = arSessionManager;
-}
-
-- (void)maybeStopARSession
-{
-  if (_arSessionManager) {
-    [_arSessionManager stop];
-    _arSessionManager = nil;
-  }
-}
-
-@end