Revert "Manage resource and onscreen contexts using separate IOSGLContext objects (flutter#12277)"

This reverts commit 5a8da65.

Author: gaaclarke

shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h

@@ -24,9 +24,8 @@
 
 - (instancetype)init NS_DESIGNATED_INITIALIZER;
 - (instancetype)initWithContentsScale:(CGFloat)contentsScale;
-- (std::unique_ptr<flutter::IOSSurface>)
-    createSurfaceWithOnscreenGLContext:(fml::WeakPtr<flutter::IOSGLContext>)onscreenGLContext
-                     resourceGLContext:(fml::WeakPtr<flutter::IOSGLContext>)resourceGLContext;
+- (std::unique_ptr<flutter::IOSSurface>)createSurface:
+    (std::shared_ptr<flutter::IOSGLContext>)gl_context;
 
 @end
 

shell/platform/darwin/ios/framework/Source/FlutterOverlayView.mm

@@ -78,17 +78,15 @@ + (Class)layerClass {
 #endif  // TARGET_IPHONE_SIMULATOR
 }
 
-- (std::unique_ptr<flutter::IOSSurface>)
-    createSurfaceWithOnscreenGLContext:(fml::WeakPtr<flutter::IOSGLContext>)onscreenGLContext
-                     resourceGLContext:(fml::WeakPtr<flutter::IOSGLContext>)resourceGLContext {
+- (std::unique_ptr<flutter::IOSSurface>)createSurface:
+    (std::shared_ptr<flutter::IOSGLContext>)gl_context {
   if ([self.layer isKindOfClass:[CAEAGLLayer class]]) {
     fml::scoped_nsobject<CAEAGLLayer> eagl_layer(
         reinterpret_cast<CAEAGLLayer*>([self.layer retain]));
     if (@available(iOS 9.0, *)) {
       eagl_layer.get().presentsWithTransaction = YES;
     }
-    return std::make_unique<flutter::IOSSurfaceGL>(std::move(eagl_layer), onscreenGLContext,
-                                                   resourceGLContext);
+    return std::make_unique<flutter::IOSSurfaceGL>(std::move(eagl_layer), gl_context);
 #if FLUTTER_SHELL_ENABLE_METAL
   } else if ([self.layer isKindOfClass:[CAMetalLayer class]]) {
     fml::scoped_nsobject<CAMetalLayer> metalLayer(

shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm

@@ -363,13 +363,12 @@
 }
 
 bool FlutterPlatformViewsController::SubmitFrame(GrContext* gr_context,
-                                                 fml::WeakPtr<IOSGLContext> onscreen_gl_context,
-                                                 fml::WeakPtr<IOSGLContext> resource_gl_context) {
+                                                 std::shared_ptr<IOSGLContext> gl_context) {
   DisposeViews();
 
   bool did_submit = true;
   for (int64_t view_id : composition_order_) {
-    EnsureOverlayInitialized(view_id, onscreen_gl_context, resource_gl_context, gr_context);
+    EnsureOverlayInitialized(view_id, std::move(gl_context), gr_context);
     auto frame = overlays_[view_id]->surface->AcquireFrame(frame_size_);
     SkCanvas* canvas = frame->SkiaCanvas();
     canvas->drawPicture(picture_recorders_[view_id]->finishRecordingAsPicture());
@@ -453,8 +452,7 @@
 
 void FlutterPlatformViewsController::EnsureOverlayInitialized(
     int64_t overlay_id,
-    fml::WeakPtr<IOSGLContext> onscreen_gl_context,
-    fml::WeakPtr<IOSGLContext> resource_gl_context,
+    std::shared_ptr<IOSGLContext> gl_context,
     GrContext* gr_context) {
   FML_DCHECK(flutter_view_);
 
@@ -470,9 +468,7 @@
     overlay_view.get().frame = flutter_view_.get().bounds;
     overlay_view.get().autoresizingMask =
         (UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight);
-    std::unique_ptr<IOSSurface> ios_surface = [overlay_view.get()
-        createSurfaceWithOnscreenGLContext:fml::WeakPtr<flutter::IOSGLContext>()
-                         resourceGLContext:fml::WeakPtr<flutter::IOSGLContext>()];
+    std::unique_ptr<IOSSurface> ios_surface = [overlay_view.get() createSurface:nil];
     std::unique_ptr<Surface> surface = ios_surface->CreateGPUSurface();
     overlays_[overlay_id] = std::make_unique<FlutterPlatformViewLayer>(
         std::move(overlay_view), std::move(ios_surface), std::move(surface));
@@ -497,8 +493,7 @@
   overlay_view.get().autoresizingMask =
       (UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight);
   std::unique_ptr<IOSSurface> ios_surface =
-      [overlay_view.get() createSurfaceWithOnscreenGLContext:std::move(onscreen_gl_context)
-                                           resourceGLContext:std::move(resource_gl_context)];
+      [overlay_view.get() createSurface:std::move(gl_context)];
   std::unique_ptr<Surface> surface = ios_surface->CreateGPUSurface(gr_context);
   overlays_[overlay_id] = std::make_unique<FlutterPlatformViewLayer>(
       std::move(overlay_view), std::move(ios_surface), std::move(surface));

shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h

@@ -100,9 +100,7 @@ class FlutterPlatformViewsController {
   // Discards all platform views instances and auxiliary resources.
   void Reset();
 
-  bool SubmitFrame(GrContext* gr_context,
-                   fml::WeakPtr<IOSGLContext> onscreen_gl_context,
-                   fml::WeakPtr<IOSGLContext> resource_gl_context);
+  bool SubmitFrame(GrContext* gr_context, std::shared_ptr<IOSGLContext> gl_context);
 
   void OnMethodCall(FlutterMethodCall* call, FlutterResult& result);
 
@@ -164,8 +162,7 @@ class FlutterPlatformViewsController {
   // Dispose the views in `views_to_dispose_`.
   void DisposeViews();
   void EnsureOverlayInitialized(int64_t overlay_id,
-                                fml::WeakPtr<IOSGLContext> onscreen_gl_context,
-                                fml::WeakPtr<IOSGLContext> resource_gl_context,
+                                std::shared_ptr<IOSGLContext> gl_context,
                                 GrContext* gr_context);
 
   // This will return true after pre-roll if any of the embedded views

shell/platform/darwin/ios/framework/Source/FlutterView.h

@@ -33,8 +33,8 @@
 
 - (instancetype)initWithDelegate:(id<FlutterViewEngineDelegate>)delegate
                           opaque:(BOOL)opaque NS_DESIGNATED_INITIALIZER;
-- (std::unique_ptr<flutter::IOSSurface>)createSurfaceWithResourceGLContext:
-    (fml::WeakPtr<flutter::IOSGLContext>)resourceGLContext;
+- (std::unique_ptr<flutter::IOSSurface>)createSurface:
+    (std::shared_ptr<flutter::IOSGLContext>)context;
 
 @end
 

shell/platform/darwin/ios/framework/Source/FlutterView.mm

@@ -13,7 +13,6 @@
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/common/rasterizer.h"
 #include "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h"
-#include "flutter/shell/platform/darwin/ios/ios_gl_context.h"
 #include "flutter/shell/platform/darwin/ios/ios_surface_gl.h"
 #include "flutter/shell/platform/darwin/ios/ios_surface_software.h"
 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
@@ -22,10 +21,9 @@
 #include "flutter/shell/platform/darwin/ios/ios_surface_metal.h"
 #endif  //  FLUTTER_SHELL_ENABLE_METAL
 
-@implementation FlutterView {
-  id<FlutterViewEngineDelegate> _delegate;
-  std::unique_ptr<flutter::IOSGLContext> _onscreenGLContext;
-}
+@implementation FlutterView
+
+id<FlutterViewEngineDelegate> _delegate;
 
 - (instancetype)init {
   @throw([NSException exceptionWithName:@"FlutterView must initWithDelegate"
@@ -95,14 +93,8 @@ + (Class)layerClass {
 #endif  // TARGET_IPHONE_SIMULATOR
 }
 
-- (std::unique_ptr<flutter::IOSSurface>)createSurfaceWithResourceGLContext:
-    (fml::WeakPtr<flutter::IOSGLContext>)resourceGLContext {
-#if !TARGET_IPHONE_SIMULATOR
-  if (!_onscreenGLContext) {
-    _onscreenGLContext = resourceGLContext->MakeSharedContext();
-  }
-#endif  // !TARGET_IPHONE_SIMULATOR
-
+- (std::unique_ptr<flutter::IOSSurface>)createSurface:
+    (std::shared_ptr<flutter::IOSGLContext>)context {
   if ([self.layer isKindOfClass:[CAEAGLLayer class]]) {
     fml::scoped_nsobject<CAEAGLLayer> eagl_layer(
         reinterpret_cast<CAEAGLLayer*>([self.layer retain]));
@@ -113,9 +105,8 @@ + (Class)layerClass {
         eagl_layer.get().presentsWithTransaction = YES;
       }
     }
-    return std::make_unique<flutter::IOSSurfaceGL>(
-        _onscreenGLContext->GetWeakPtr(), std::move(resourceGLContext), std::move(eagl_layer),
-        [_delegate platformViewsController]);
+    return std::make_unique<flutter::IOSSurfaceGL>(context, std::move(eagl_layer),
+                                                   [_delegate platformViewsController]);
 #if FLUTTER_SHELL_ENABLE_METAL
   } else if ([self.layer isKindOfClass:[CAMetalLayer class]]) {
     fml::scoped_nsobject<CAMetalLayer> metalLayer(

shell/platform/darwin/ios/ios_gl_context.h

@@ -13,32 +13,30 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/common/platform_view.h"
+#include "ios_gl_render_target.h"
 
 namespace flutter {
 
 class IOSGLContext {
  public:
   IOSGLContext();
-  IOSGLContext(EAGLSharegroup* sharegroup);
 
   ~IOSGLContext();
 
+  std::unique_ptr<IOSGLRenderTarget> CreateRenderTarget(
+      fml::scoped_nsobject<CAEAGLLayer> layer);
+
   bool MakeCurrent();
 
-  bool BindRenderbufferStorage(fml::scoped_nsobject<CAEAGLLayer> layer);
+  bool ResourceMakeCurrent();
 
   sk_sp<SkColorSpace> ColorSpace() const { return color_space_; }
 
-  std::unique_ptr<IOSGLContext> MakeSharedContext();
-
-  fml::WeakPtr<IOSGLContext> GetWeakPtr();
-
  private:
   fml::scoped_nsobject<EAGLContext> context_;
+  fml::scoped_nsobject<EAGLContext> resource_context_;
   sk_sp<SkColorSpace> color_space_;
 
-  std::unique_ptr<fml::WeakPtrFactory<IOSGLContext>> weak_factory_;
-
   FML_DISALLOW_COPY_AND_ASSIGN(IOSGLContext);
 };
 

shell/platform/darwin/ios/ios_gl_context.mm

@@ -12,16 +12,15 @@
 
 namespace flutter {
 
-IOSGLContext::IOSGLContext() : IOSGLContext(nullptr) {}
-
-IOSGLContext::IOSGLContext(EAGLSharegroup* sharegroup)
-    : weak_factory_(std::make_unique<fml::WeakPtrFactory<IOSGLContext>>(this)) {
-  context_.reset([[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3
-                                       sharegroup:sharegroup]);
-
-  if (!context_) {
+IOSGLContext::IOSGLContext() {
+  resource_context_.reset([[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3]);
+  if (resource_context_ != nullptr) {
+    context_.reset([[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3
+                                         sharegroup:resource_context_.get().sharegroup]);
+  } else {
+    resource_context_.reset([[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2]);
     context_.reset([[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2
-                                         sharegroup:sharegroup]);
+                                         sharegroup:resource_context_.get().sharegroup]);
   }
 
   // TODO:
@@ -45,22 +44,20 @@
   }
 }
 
-fml::WeakPtr<IOSGLContext> IOSGLContext::GetWeakPtr() {
-  return weak_factory_->GetWeakPtr();
-}
+IOSGLContext::~IOSGLContext() = default;
 
-bool IOSGLContext::BindRenderbufferStorage(fml::scoped_nsobject<CAEAGLLayer> layer) {
-  return [context_.get() renderbufferStorage:GL_RENDERBUFFER fromDrawable:layer.get()];
+std::unique_ptr<IOSGLRenderTarget> IOSGLContext::CreateRenderTarget(
+    fml::scoped_nsobject<CAEAGLLayer> layer) {
+  return std::make_unique<IOSGLRenderTarget>(std::move(layer), context_.get(),
+                                             resource_context_.get());
 }
 
-IOSGLContext::~IOSGLContext() = default;
-
 bool IOSGLContext::MakeCurrent() {
   return [EAGLContext setCurrentContext:context_.get()];
 }
 
-std::unique_ptr<IOSGLContext> IOSGLContext::MakeSharedContext() {
-  return std::make_unique<IOSGLContext>(context_.get().sharegroup);
+bool IOSGLContext::ResourceMakeCurrent() {
+  return [EAGLContext setCurrentContext:resource_context_.get()];
 }
 
 }  // namespace flutter

shell/platform/darwin/ios/ios_gl_render_target.h

@@ -13,15 +13,14 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/platform/darwin/scoped_nsobject.h"
 #include "flutter/shell/common/platform_view.h"
-#include "flutter/shell/platform/darwin/ios/ios_gl_context.h"
 
 namespace flutter {
 
 class IOSGLRenderTarget {
  public:
   IOSGLRenderTarget(fml::scoped_nsobject<CAEAGLLayer> layer,
-                    fml::WeakPtr<IOSGLContext> onscreen_context,
-                    fml::WeakPtr<IOSGLContext> resource_context);
+                    EAGLContext* context,
+                    EAGLContext* resource_context);
 
   ~IOSGLRenderTarget();
 
@@ -41,8 +40,8 @@ class IOSGLRenderTarget {
 
  private:
   fml::scoped_nsobject<CAEAGLLayer> layer_;
-  fml::WeakPtr<IOSGLContext> onscreen_gl_context_;
-  fml::WeakPtr<IOSGLContext> resource_gl_context_;
+  fml::scoped_nsobject<EAGLContext> context_;
+  fml::scoped_nsobject<EAGLContext> resource_context_;
   GLuint framebuffer_;
   GLuint colorbuffer_;
   GLint storage_size_width_;

shell/platform/darwin/ios/ios_gl_render_target.mm

@@ -11,22 +11,23 @@
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
 
 namespace flutter {
+
 IOSGLRenderTarget::IOSGLRenderTarget(fml::scoped_nsobject<CAEAGLLayer> layer,
-                                     fml::WeakPtr<IOSGLContext> onscreen_gl_context,
-                                     fml::WeakPtr<IOSGLContext> resource_gl_context)
+                                     EAGLContext* context,
+                                     EAGLContext* resource_context)
     : layer_(std::move(layer)),
-      onscreen_gl_context_(std::move(onscreen_gl_context)),
-      resource_gl_context_(std::move(resource_gl_context)),
+      context_([context retain]),
+      resource_context_([resource_context retain]),
       framebuffer_(GL_NONE),
       colorbuffer_(GL_NONE),
       storage_size_width_(0),
       storage_size_height_(0),
       valid_(false) {
   FML_DCHECK(layer_ != nullptr);
-  FML_DCHECK(onscreen_gl_context_);
-  FML_DCHECK(resource_gl_context_);
+  FML_DCHECK(context_ != nullptr);
+  FML_DCHECK(resource_context_ != nullptr);
 
-  bool context_current = onscreen_gl_context_->MakeCurrent();
+  bool context_current = [EAGLContext setCurrentContext:context_];
 
   FML_DCHECK(context_current);
   FML_DCHECK(glGetError() == GL_NO_ERROR);
@@ -62,7 +63,7 @@
 
 IOSGLRenderTarget::~IOSGLRenderTarget() {
   EAGLContext* context = EAGLContext.currentContext;
-  onscreen_gl_context_->MakeCurrent();
+  [EAGLContext setCurrentContext:context_];
   FML_DCHECK(glGetError() == GL_NO_ERROR);
 
   // Deletes on GL_NONEs are ignored
@@ -104,7 +105,7 @@
 
   FML_DCHECK(glGetError() == GL_NO_ERROR);
 
-  if (!onscreen_gl_context_->MakeCurrent()) {
+  if (![EAGLContext setCurrentContext:context_]) {
     return false;
   }
 
@@ -115,7 +116,7 @@
   glBindRenderbuffer(GL_RENDERBUFFER, colorbuffer_);
   FML_DCHECK(glGetError() == GL_NO_ERROR);
 
-  if (!onscreen_gl_context_->BindRenderbufferStorage(layer_)) {
+  if (![context_.get() renderbufferStorage:GL_RENDERBUFFER fromDrawable:layer_.get()]) {
     return false;
   }
 
@@ -132,11 +133,11 @@
 }
 
 bool IOSGLRenderTarget::MakeCurrent() {
-  return UpdateStorageSizeIfNecessary() && onscreen_gl_context_->MakeCurrent();
+  return UpdateStorageSizeIfNecessary() && [EAGLContext setCurrentContext:context_.get()];
 }
 
 bool IOSGLRenderTarget::ResourceMakeCurrent() {
-  return resource_gl_context_->MakeCurrent();
+  return [EAGLContext setCurrentContext:resource_context_.get()];
 }
 
 }  // namespace flutter