Removing RTC_SUPPORTS_METAL compilation flag. This flag is a holdover from before either macOS or the iOS Simulator supported Metal rendering.

Bug: webrtc:12638
Change-Id: I21054bdcf4c941086234562c4ee1740754050590
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/216700
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34362}

BUILD.gn

@@ -435,10 +435,6 @@ config("common_config") {
 
 config("common_objc") {
   frameworks = [ "Foundation.framework" ]
-
-  if (rtc_use_metal_rendering) {
-    defines = [ "RTC_SUPPORTS_METAL" ]
-  }
 }
 
 if (!build_with_chromium) {

examples/BUILD.gn

@@ -342,15 +342,13 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
         "../sdk:base_objc",
         "../sdk:helpers_objc",
         "../sdk:mediaconstraints_objc",
+        "../sdk:metal_objc",
         "../sdk:peerconnectionfactory_base_objc",
         "../sdk:peerconnectionfactory_base_objc",
         "../sdk:ui_objc",
         "../sdk:videocapture_objc",
         "../sdk:videocodec_objc",
       ]
-      if (rtc_use_metal_rendering) {
-        deps += [ "../sdk:metal_objc" ]
-      }
 
       frameworks = [ "AVFoundation.framework" ]
     }
@@ -499,6 +497,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
         "../sdk:base_objc",
         "../sdk:default_codec_factory_objc",
         "../sdk:helpers_objc",
+        "../sdk:metal_objc",
         "../sdk:native_api",
         "../sdk:ui_objc",
         "../sdk:videocapture_objc",

examples/objc/AppRTCMobile/ios/ARDVideoCallView.m

@@ -12,10 +12,7 @@
 
 #import <AVFoundation/AVFoundation.h>
 
-#import "sdk/objc/components/renderer/opengl/RTCEAGLVideoView.h"
+#import "sdk/objc/components/renderer/metal/RTCMTLVideoView.h"
-#if defined(RTC_SUPPORTS_METAL)
-#import "sdk/objc/components/renderer/metal/RTCMTLVideoView.h"  // nogncheck
-#endif
 
 #import "UIImage+ARDUtilities.h"
 
@@ -44,14 +41,7 @@ static CGFloat const kStatusBarHeight = 20;
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
 
-#if defined(RTC_SUPPORTS_METAL)
     _remoteVideoView = [[RTC_OBJC_TYPE(RTCMTLVideoView) alloc] initWithFrame:CGRectZero];
-#else
-    RTC_OBJC_TYPE(RTCEAGLVideoView) *remoteView =
-        [[RTC_OBJC_TYPE(RTCEAGLVideoView) alloc] initWithFrame:CGRectZero];
-    remoteView.delegate = self;
-    _remoteVideoView = remoteView;
-#endif
 
     [self addSubview:_remoteVideoView];
 

examples/objcnativeapi/objc/NADViewController.mm

@@ -12,10 +12,7 @@
 
 #import "sdk/objc/base/RTCVideoRenderer.h"
 #import "sdk/objc/components/capturer/RTCCameraVideoCapturer.h"
-#if defined(RTC_SUPPORTS_METAL)
+#import "sdk/objc/components/renderer/metal/RTCMTLVideoView.h"
-#import "sdk/objc/components/renderer/metal/RTCMTLVideoView.h"  // nogncheck
-#endif
-#import "sdk/objc/components/renderer/opengl/RTCEAGLVideoView.h"
 #import "sdk/objc/helpers/RTCCameraPreviewView.h"
 
 #include <memory>
@@ -49,11 +46,7 @@
 - (void)loadView {
   _view = [[UIView alloc] initWithFrame:CGRectZero];
 
-#if defined(RTC_SUPPORTS_METAL)
   _remoteVideoView = [[RTC_OBJC_TYPE(RTCMTLVideoView) alloc] initWithFrame:CGRectZero];
-#else
-  _remoteVideoView = [[RTC_OBJC_TYPE(RTCEAGLVideoView) alloc] initWithFrame:CGRectZero];
-#endif
   _remoteVideoView.translatesAutoresizingMaskIntoConstraints = NO;
   [_view addSubview:_remoteVideoView];
 

webrtc.gni

@@ -183,9 +183,6 @@ declare_args() {
     rtc_apprtcmobile_broadcast_extension = false
   }
 
-  # Determines whether Metal is available on iOS/macOS.
-  rtc_use_metal_rendering = is_mac || (is_ios && current_cpu == "arm64")
-
   # When set to false, builtin audio encoder/decoder factories and all the
   # audio codecs they depend on will not be included in libwebrtc.{a|lib}
   # (they will still be included in libjingle_peerconnection_so.so and