Revert "[metal] Darwin unified external metal textures"

ci/licenses_golden/licenses_flutter

@@ -969,8 +969,6 @@ FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/flutter_cod
 FILE: ../../../flutter/shell/platform/darwin/common/framework/Source/flutter_standard_codec_unittest.mm
 FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetal.h
 FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetal.mm
-FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.h
-FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.mm
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Flutter.podspec
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/Flutter.h
 FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h

common/config.gni

@@ -62,6 +62,4 @@ if (is_ios || is_mac) {
     "-Werror=undeclared-selector",
   ]
   flutter_cflags_objcc = flutter_cflags_objc
-  flutter_cflags_objc_arc = flutter_cflags_objc + [ "-fobjc-arc" ]
-  flutter_cflags_objcc_arc = flutter_cflags_objc_arc
 }

common/graphics/texture.h

@@ -18,8 +18,8 @@ namespace flutter {
 
 class Texture {
  public:
-  explicit Texture(int64_t id);  // Called from UI or raster thread.
-  virtual ~Texture();            // Called from raster thread.
+  Texture(int64_t id);  // Called from UI or raster thread.
+  virtual ~Texture();   // Called from raster thread.
 
   // Called from raster thread.
   virtual void Paint(SkCanvas& canvas,

shell/platform/darwin/graphics/BUILD.gn

@@ -7,24 +7,19 @@ assert(is_ios || is_mac)
 import("//flutter/common/config.gni")
 
 source_set("graphics") {
-  cflags_objc = flutter_cflags_objc_arc
-  cflags_objcc = flutter_cflags_objcc_arc
+  cflags_objc = flutter_cflags_objc
+  cflags_objcc = flutter_cflags_objcc
 
   sources = [
     "FlutterDarwinContextMetal.h",
     "FlutterDarwinContextMetal.mm",
-    "FlutterDarwinExternalTextureMetal.h",
-    "FlutterDarwinExternalTextureMetal.mm",
   ]
 
   deps = [
     "//flutter/common/graphics",
     "//flutter/fml",
-    "//flutter/shell/platform/darwin/common:framework_shared",
   ]
 
-  libs = [ "CoreVideo.framework" ]
-
   public_deps = [ "//third_party/skia" ]
 
   public_configs = [ "//flutter:config" ]

shell/platform/darwin/graphics/FlutterDarwinContextMetal.h

@@ -5,12 +5,9 @@
 #ifndef SHELL_PLATFORM_DARWIN_GRAPHICS_DARWIN_CONTEXT_METAL_H_
 #define SHELL_PLATFORM_DARWIN_GRAPHICS_DARWIN_CONTEXT_METAL_H_
 
-#import <CoreVideo/CVMetalTextureCache.h>
 #import <Foundation/Foundation.h>
 #import <Metal/Metal.h>
 
-#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h"
-#import "flutter/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 
 NS_ASSUME_NONNULL_BEGIN
@@ -32,13 +29,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)initWithMTLDevice:(id<MTLDevice>)device
                      commandQueue:(id<MTLCommandQueue>)commandQueue;
 
-/**
- * Creates an external texture with the specified ID and contents.
- */
-- (FlutterDarwinExternalTextureMetal*)
-    createExternalTextureWithIdentifier:(int64_t)textureID
-                                texture:(NSObject<FlutterTexture>*)texture;
-
 /**
  * MTLDevice that is backing this context.s
  */
@@ -60,11 +50,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property(nonatomic, readonly) sk_sp<GrDirectContext> resourceContext;
 
-/*
- * Texture cache for external textures.
- */
-@property(nonatomic, readonly) CVMetalTextureCacheRef textureCache;
-
 @end
 
 NS_ASSUME_NONNULL_END

shell/platform/darwin/graphics/FlutterDarwinContextMetal.mm

@@ -6,11 +6,8 @@
 
 #include "flutter/common/graphics/persistent_cache.h"
 #include "flutter/fml/logging.h"
-#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"
 #include "third_party/skia/include/gpu/GrContextOptions.h"
 
-FLUTTER_ASSERT_ARC
-
 static GrContextOptions CreateMetalGrContextOptions() {
   GrContextOptions options = {};
   if (flutter::PersistentCache::cache_sksl()) {
@@ -36,39 +33,32 @@ - (instancetype)initWithMTLDevice:(id<MTLDevice>)device
 
     if (!_device) {
       FML_DLOG(ERROR) << "Could not acquire Metal device.";
+      [self release];
       return nil;
     }
 
     _commandQueue = commandQueue;
 
     if (!_commandQueue) {
       FML_DLOG(ERROR) << "Could not create Metal command queue.";
+      [self release];
       return nil;
     }
 
     [_commandQueue setLabel:@"Flutter Main Queue"];
 
-    CVReturn cvReturn = CVMetalTextureCacheCreate(kCFAllocatorDefault,  // allocator
-                                                  nil,      // cache attributes (nil default)
-                                                  _device,  // metal device
-                                                  nil,      // texture attributes (nil default)
-                                                  &_textureCache  // [out] cache
-    );
-    if (cvReturn != kCVReturnSuccess) {
-      FML_DLOG(ERROR) << "Could not create Metal texture cache.";
-      return nil;
-    }
-
     auto contextOptions = CreateMetalGrContextOptions();
 
     // Skia expect arguments to `MakeMetal` transfer ownership of the reference in for release later
     // when the GrDirectContext is collected.
-    _mainContext = GrDirectContext::MakeMetal(
-        (__bridge_retained void*)_device, (__bridge_retained void*)_commandQueue, contextOptions);
-    _resourceContext = _mainContext;
+    _mainContext =
+        GrDirectContext::MakeMetal([_device retain], [_commandQueue retain], contextOptions);
+    _resourceContext =
+        GrDirectContext::MakeMetal([_device retain], [_commandQueue retain], contextOptions);
 
     if (!_mainContext || !_resourceContext) {
       FML_DLOG(ERROR) << "Could not create Skia Metal contexts.";
+      [self release];
       return nil;
     }
 
@@ -77,18 +67,4 @@ - (instancetype)initWithMTLDevice:(id<MTLDevice>)device
   return self;
 }
 
-- (void)dealloc {
-  if (_textureCache) {
-    CFRelease(_textureCache);
-  }
-}
-
-- (FlutterDarwinExternalTextureMetal*)
-    createExternalTextureWithIdentifier:(int64_t)textureID
-                                texture:(NSObject<FlutterTexture>*)texture {
-  return [[FlutterDarwinExternalTextureMetal alloc] initWithTextureCache:_textureCache
-                                                               textureID:textureID
-                                                                 texture:texture];
-}
-
 @end