Enabled metal on ios simulator

Author: Kavantix

shell/gpu/gpu_surface_metal.h

@@ -17,7 +17,11 @@
 
 namespace flutter {
 
+#if TARGET_IPHONE_SIMULATOR
+class API_AVAILABLE(ios(13.0)) GPUSurfaceMetal : public Surface {
+#else
 class GPUSurfaceMetal : public Surface {
+#endif  // TARGET_IPHONE_SIMULATOR
  public:
   GPUSurfaceMetal(GPUSurfaceDelegate* delegate,
                   fml::scoped_nsobject<CAMetalLayer> layer,

shell/gpu/gpu_surface_metal.mm

@@ -15,6 +15,9 @@
 
 namespace flutter {
 
+#if TARGET_IPHONE_SIMULATOR
+API_AVAILABLE(ios(13.0))
+#endif  // TARGET_IPHONE_SIMULATOR
 GPUSurfaceMetal::GPUSurfaceMetal(GPUSurfaceDelegate* delegate,
                                  fml::scoped_nsobject<CAMetalLayer> layer,
                                  sk_sp<GrContext> context,
@@ -40,6 +43,9 @@
 
 // |Surface|
 std::unique_ptr<SurfaceFrame> GPUSurfaceMetal::AcquireFrame(const SkISize& frame_size) {
+  #if TARGET_IPHONE_SIMULATOR
+  if (@available(iOS 13.0, *)) {
+  #endif  // TARGET_IPHONE_SIMULATOR
   if (!IsValid()) {
     FML_LOG(ERROR) << "Metal surface was invalid.";
     return nullptr;
@@ -97,6 +103,10 @@
   };
 
   return std::make_unique<SurfaceFrame>(std::move(surface), true, submit_callback);
+  #if TARGET_IPHONE_SIMULATOR
+  }
+  return nil;
+  #endif  // TARGET_IPHONE_SIMULATOR
 }
 
 // |Surface|

shell/platform/darwin/ios/ios_surface.mm

@@ -39,6 +39,9 @@ bool IsIosEmbeddedViewsPreviewEnabled() {
   }
 
 #if FLUTTER_SHELL_ENABLE_METAL
+#if TARGET_IPHONE_SIMULATOR
+  if (@available(iOS 13.0, *)) {
+#endif  // TARGET_IPHONE_SIMULATOR
   if ([layer.get() isKindOfClass:[CAMetalLayer class]]) {
     return std::make_unique<IOSSurfaceMetal>(
         fml::scoped_nsobject<CAMetalLayer>(
@@ -47,6 +50,9 @@ bool IsIosEmbeddedViewsPreviewEnabled() {
         platform_views_controller                                    // platform views controller
     );
   }
+#if TARGET_IPHONE_SIMULATOR
+  }
+#endif  // TARGET_IPHONE_SIMULATOR
 #endif  // FLUTTER_SHELL_ENABLE_METAL
 
   return std::make_unique<IOSSurfaceSoftware>(

shell/platform/darwin/ios/ios_surface_metal.h

@@ -13,7 +13,11 @@
 
 namespace flutter {
 
+#if TARGET_IPHONE_SIMULATOR
+class API_AVAILABLE(ios(13.0)) IOSSurfaceMetal final : public IOSSurface, public GPUSurfaceDelegate {
+#else
 class IOSSurfaceMetal final : public IOSSurface, public GPUSurfaceDelegate {
+#endif  // TARGET_IPHONE_SIMULATOR
  public:
   IOSSurfaceMetal(fml::scoped_nsobject<CAMetalLayer> layer,
                   std::shared_ptr<IOSContext> context,

shell/platform/darwin/ios/ios_surface_metal.mm

@@ -13,6 +13,10 @@
   return reinterpret_cast<IOSContextMetal*>(context.get());
 }
 
+
+#if TARGET_IPHONE_SIMULATOR
+API_AVAILABLE(ios(13.0))
+#endif  // TARGET_IPHONE_SIMULATOR
 IOSSurfaceMetal::IOSSurfaceMetal(fml::scoped_nsobject<CAMetalLayer> layer,
                                  std::shared_ptr<IOSContext> context,
                                  FlutterPlatformViewsController* platform_views_controller)

shell/platform/darwin/ios/rendering_api_selection.mm

@@ -23,21 +23,30 @@ bool ShouldUseMetalRenderer() {
   bool ios_version_supports_metal = false;
   if (@available(iOS 10.0, *)) {
     auto device = MTLCreateSystemDefaultDevice();
-    ios_version_supports_metal = [device supportsFeatureSet:MTLFeatureSet_iOS_GPUFamily1_v3];
+    // We need to check if the device is here since an ios 13 simulator running on an older version
+    // of macos (below 10.15) will not actually allow metal to be used
+    if (device != nil) {
+      ios_version_supports_metal = [device supportsFeatureSet:MTLFeatureSet_iOS_GPUFamily1_v3];
+    }
   }
   return ios_version_supports_metal;
 }
 #endif  // FLUTTER_SHELL_ENABLE_METAL
 
 IOSRenderingAPI GetRenderingAPIForProcess() {
-#if TARGET_IPHONE_SIMULATOR
-  return IOSRenderingAPI::kSoftware;
-#endif  // TARGET_IPHONE_SIMULATOR
 
 #if FLUTTER_SHELL_ENABLE_METAL
   static bool should_use_metal = ShouldUseMetalRenderer();
   if (should_use_metal) {
-    return IOSRenderingAPI::kMetal;
+#if TARGET_IPHONE_SIMULATOR
+    if (@available(iOS 13.0, *)) {
+      return IOSRenderingAPI::kMetal;
+    } else {
+      return IOSRenderingAPI::kSoftware;
+    }
+#else
+      return IOSRenderingAPI::kMetal;
+#endif  // TARGET_IPHONE_SIMULATOR
   }
 #endif  // FLUTTER_SHELL_ENABLE_METAL
   return IOSRenderingAPI::kOpenGLES;
@@ -49,9 +58,16 @@ Class GetCoreAnimationLayerClassForRenderingAPI(IOSRenderingAPI rendering_api) {
       return [CALayer class];
     case IOSRenderingAPI::kOpenGLES:
       return [CAEAGLLayer class];
-#if !TARGET_IPHONE_SIMULATOR
     case IOSRenderingAPI::kMetal:
+#if !TARGET_IPHONE_SIMULATOR
       return [CAMetalLayer class];
+#else
+      // This will always be true since we filter out this case when checking if the device
+      // supports metal
+      if (@available(iOS 13.0, *)) {
+        return [CAMetalLayer class];
+      }
+      break;
 #endif  // !TARGET_IPHONE_SIMULATOR
     default:
       break;

tools/gn

@@ -217,7 +217,7 @@ def to_gn_args(args):
       gn_args['goma_dir'] = None
 
     # Enable Metal on non-simulator iOS builds.
-    if args.target_os == 'ios' and not args.simulator:
+    if args.target_os == 'ios':
       gn_args['skia_use_metal'] = True
       gn_args['shell_enable_metal'] = True
       # Bitcode enabled builds using the current version of the toolchain leak