iOS build support

BUILD.gn

@@ -169,7 +169,6 @@ config("extra_warnings") {
     cflags += [
       "-Wbad-function-cast",
       "-Wconditional-uninitialized",
-      "-Wdeprecated-copy",
       "-Wextra-semi-stmt",
       "-Wfloat-conversion",
       "-Winconsistent-missing-destructor-override",
@@ -179,8 +178,6 @@ config("extra_warnings") {
       "-Wredundant-parens",
       "-Wreturn-std-move-in-c++11",
       "-Wshadow-field",
-      "-Wsuggest-destructor-override",
-      "-Wsuggest-override",
       "-Wtautological-type-limit-compare",
       "-Wundefined-reinterpret-cast",
       "-Wunneeded-internal-declaration",
@@ -194,6 +191,14 @@ config("extra_warnings") {
       "-Wunreachable-code",
       "-Wshorten-64-to-32",
     ]
+    if (!use_xcode_clang) {
+      # Mac catalyst uses a clang version that doesn't have these.
+      cflags += [
+        "-Wdeprecated-copy",
+        "-Wsuggest-destructor-override",
+        "-Wsuggest-override",
+      ]
+    }
   }
 
   if (angle_is_winuwp) {
@@ -435,14 +440,23 @@ angle_static_library("angle_gpu_info_util") {
     libs += [ "pci" ]
   }
 
-  if (is_mac) {
-    sources += libangle_gpu_info_util_mac_sources
+  if (is_mac || is_ios) {
     frameworks = [
       "IOKit.framework",
       "CoreFoundation.framework",
       "CoreGraphics.framework",
-      "OpenGL.framework",
     ]
+    if (angle_enable_eagl) {
+      frameworks += [ "OpenGLES.framework" ]
+    } else if (angle_enable_cgl) {
+      frameworks += [ "OpenGL.framework" ]
+    }
+    if (is_mac || angle_enable_cgl) {
+      sources += libangle_gpu_info_util_mac_sources
+    }
+    if (is_ios && !angle_enable_cgl) {
+      sources += libangle_gpu_info_util_ios_sources
+    }
   }
 }
 
@@ -732,11 +746,11 @@ angle_source_set("libANGLE_base") {
   }
 
   # Enable extra Chromium style warnings for libANGLE.
-  if (is_clang && angle_has_build) {
+  if (is_clang && angle_has_build && !use_xcode_clang) {
     suppressed_configs -= [ "//build/config/clang:find_bad_constructs" ]
   }
 
-  if (is_mac) {
+  if (is_mac || is_ios) {
     sources += libangle_mac_sources
   }
 
@@ -835,7 +849,7 @@ angle_source_set("libANGLE_with_capture") {
 }
 
 config("shared_library_public_config") {
-  if (is_mac && !is_component_build) {
+  if ((is_ios || is_mac) && !is_component_build) {
     # Executable targets that depend on the shared libraries below need to have
     # the rpath setup in non-component build configurations.
     ldflags = [
@@ -1125,7 +1139,7 @@ if (angle_has_build) {
       "${angle_jsoncpp_dir}:jsoncpp_config",
     ]
 
-    if (is_mac && !is_component_build) {
+    if ((is_ios || is_mac) && !is_component_build) {
       ldflags = [
         "-install_name",
         "@rpath/${target_name}.dylib",

gni/angle.gni

@@ -145,9 +145,17 @@ declare_args() {
 
   # Disable performance counter output by default
   angle_enable_perf_counter_output = false
+
+  # We should use EAGL (ES) on iOS except on Mac Catalyst on Intel CPUs, which uses CGL (desktop GL).
+  angle_enable_eagl = angle_enable_gl && is_ios &&
+                      !(target_environment == "catalyst" &&
+                        (target_cpu == "x86" || target_cpu == "x64"))
 }
 
 declare_args() {
+  # TODO(jdarpinian): Support enabling CGL and EAGL at the same time using the soft linking code. Also support disabling both for Metal-only builds.
+  angle_enable_cgl = angle_enable_gl && !angle_enable_eagl && (is_mac || is_ios)
+
   angle_has_histograms = angle_has_build
 }
 

src/gpu_info_util/SystemInfo_ios.cpp

@@ -19,8 +19,9 @@ bool GetSystemInfo_ios(SystemInfo *info)
 {
     {
         // TODO(anglebug.com/4275): Get the actual system version and GPU info.
-        info->machineModelVersion          = "0.0";
-        info->gpus.emplace_back().vendorId = kVendorID_Apple;
+        info->machineModelVersion = "0.0";
+        info->gpus.emplace_back();
+        info->gpus[0].vendorId = kVendorID_Apple;
     }
 
     return true;

src/libANGLE/renderer/gl/BUILD.gn

@@ -178,7 +178,7 @@ if (is_android) {
   ]
 }
 
-if (is_mac) {
+if (angle_enable_cgl) {
   _gl_backend_sources += [
     "cgl/ContextCGL.cpp",
     "cgl/ContextCGL.h",
@@ -197,6 +197,27 @@ if (is_mac) {
   ]
 }
 
+if (angle_enable_eagl) {
+  _gl_backend_sources += [
+    "eagl/ContextEAGL.cpp",
+    "eagl/ContextEAGL.h",
+    "eagl/DeviceEAGL.cpp",
+    "eagl/DeviceEAGL.h",
+    "eagl/DisplayEAGL.h",
+    "eagl/DisplayEAGL.mm",
+    "eagl/FunctionsEAGL.h",
+    "eagl/FunctionsEAGL.mm",
+    "eagl/IOSurfaceSurfaceEAGL.h",
+    "eagl/IOSurfaceSurfaceEAGL.mm",
+    "eagl/PbufferSurfaceEAGL.cpp",
+    "eagl/PbufferSurfaceEAGL.h",
+    "eagl/RendererEAGL.cpp",
+    "eagl/RendererEAGL.h",
+    "eagl/WindowSurfaceEAGL.h",
+    "eagl/WindowSurfaceEAGL.mm",
+  ]
+}
+
 if (angle_enable_gl_null) {
   _gl_backend_sources += [
     "null_functions.cpp",
@@ -209,6 +230,9 @@ config("angle_gl_backend_config") {
   if (angle_enable_gl_null) {
     defines += [ "ANGLE_ENABLE_OPENGL_NULL" ]
   }
+  if (is_mac || is_ios) {
+    defines += [ "GL_SILENCE_DEPRECATION" ]
+  }
   include_dirs = [ "../../../third_party/khronos" ]
 }
 
@@ -235,13 +259,19 @@ angle_source_set("angle_gl_backend") {
       "Xext",
     ]
   }
-  if (is_mac) {
+  if (is_mac || is_ios) {
     frameworks = [
-      "Cocoa.framework",
       "IOSurface.framework",
-      "OpenGL.framework",
       "QuartzCore.framework",
     ]
+    if (angle_enable_eagl) {
+      frameworks += [ "OpenGLES.framework" ]
+    } else if (angle_enable_cgl) {
+      frameworks += [ "OpenGL.framework" ]
+    }
+    if (is_mac) {
+      frameworks += [ "Cocoa.framework" ]
+    }
   }
   if (ozone_platform_gbm) {
     configs += [ ":libdrm" ]

src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp

@@ -56,4 +56,4 @@ void DeviceEAGL::generateExtensions(egl::DeviceExtensions *outExtensions) const
 
 }  // namespace rx
 
-#endif  // defined(ANGLE_ENABLE_EAGL)
+#endif  // defined(ANGLE_ENABLE_EAGL)
\ No newline at end of file

src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm

@@ -309,7 +309,6 @@ void DisplayEAGL::generateExtensions(egl::DisplayExtensions *outExtensions) cons
 {
     outExtensions->iosurfaceClientBuffer = true;
     outExtensions->surfacelessContext    = true;
-    outExtensions->deviceQuery           = true;
 
     // Contexts are virtualized so textures ans semaphores can be shared globally
     outExtensions->displayTextureShareGroup   = true;

src/libANGLE/renderer/gl/eagl/FunctionsEAGL.mm

@@ -20,4 +20,4 @@ SOFT_LINK_FRAMEWORK_SOURCE(OpenGLES)
 
 SOFT_LINK_CLASS(OpenGLES, EAGLContext)
 
-#endif  // defined(ANGLE_ENABLE_EAGL)
+#endif  // defined(ANGLE_ENABLE_EAGL)
\ No newline at end of file

src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm

@@ -83,8 +83,8 @@ IOSurfaceSurfaceEAGL::IOSurfaceSurfaceEAGL(const egl::SurfaceState &state,
       mWidth(0),
       mHeight(0),
       mPlane(0),
-      mRowStrideInPixels(0),
       mFormatIndex(-1),
+      mRowStrideInPixels(0),
       mAlphaInitialized(false)
 {
     // Keep reference to the IOSurface so it doesn't get deleted while the pbuffer exists.
@@ -113,6 +113,7 @@ IOSurfaceSurfaceEAGL::IOSurfaceSurfaceEAGL(const egl::SurfaceState &state,
     mAlphaInitialized = !hasEmulatedAlphaChannel();
 
 #    if defined(ANGLE_PLATFORM_IOS_SIMULATOR)
+    ANGLE_UNUSED_VARIABLE(mEAGLContext);
     mBoundTextureID = 0;
     EGLAttrib usageHint =
         attribs.get(EGL_IOSURFACE_USAGE_HINT_ANGLE,

src/libGLESv2.gni

@@ -77,7 +77,7 @@ if (is_linux || is_chromeos || is_android || is_fuchsia) {
   ]
 }
 
-if (is_mac) {
+if (is_mac || is_ios) {
   libangle_common_sources += [
     "src/common/apple/SoftLinking.h",
     "src/common/gl/cgl/FunctionsCGL.cpp",
@@ -145,6 +145,11 @@ libangle_gpu_info_util_mac_sources = [
   "src/gpu_info_util/SystemInfo_macos.mm",
 ]
 
+libangle_gpu_info_util_ios_sources = [
+  "src/gpu_info_util/SystemInfo_apple.mm",
+  "src/gpu_info_util/SystemInfo_ios.cpp",
+]
+
 libangle_includes = [
   "include/angle_gl.h",
   "include/export.h",

src/tests/BUILD.gn

@@ -12,8 +12,8 @@ declare_args() {
   build_angle_deqp_tests = false
   build_angle_gles1_conform_tests = false
   build_angle_trace_perf_tests = false
-  build_angle_perftests =
-      is_win || is_linux || is_chromeos || is_android || is_mac || is_fuchsia
+  build_angle_perftests = is_win || is_linux || is_chromeos || is_android ||
+                          is_mac || is_fuchsia || is_ios
 }
 
 angle_test("test_utils_unittest_helper") {
@@ -80,7 +80,7 @@ template("angle_common_test_utils") {
       "test_utils/angle_test_platform.h",
       "test_utils/gl_raii.h",
     ]
-    if (is_mac) {
+    if (is_mac || is_ios) {
       sources += [
         "test_utils/angle_test_instantiate_apple.h",
         "test_utils/angle_test_instantiate_apple.mm",
@@ -135,7 +135,8 @@ angle_test("angle_unittests") {
   }
 }
 
-if (is_win || is_linux || is_chromeos || is_mac || is_android || is_fuchsia) {
+if (is_win || is_linux || is_chromeos || is_mac || is_android || is_fuchsia ||
+    is_ios) {
   import("angle_end2end_tests.gni")
 
   angle_test("angle_end2end_tests") {
@@ -144,7 +145,7 @@ if (is_win || is_linux || is_chromeos || is_mac || is_android || is_fuchsia) {
     sources = angle_end2end_tests_sources + [ "angle_end2end_tests_main.cpp" ]
     libs = []
 
-    if (is_mac) {
+    if (is_mac || (is_ios && target_environment != "simulator")) {
       sources += angle_end2end_tests_mac_sources
       frameworks = [
         "CoreFoundation.framework",
@@ -191,7 +192,7 @@ if (is_win || is_linux || is_chromeos || is_mac || is_android || is_fuchsia) {
   }
 }
 
-if (is_win || is_linux || is_chromeos || is_mac || is_android) {
+if (is_win || is_linux || is_chromeos || is_mac || is_android || is_ios) {
   import("angle_white_box_tests.gni")
 
   angle_test("angle_white_box_tests") {
@@ -265,7 +266,7 @@ angle_perftests_common("angle_perftests_static") {
   test_utils = ":angle_common_test_utils_static"
 }
 
-if (is_win || is_linux || is_chromeos || is_android || is_mac) {
+if (is_win || is_linux || is_chromeos || is_android || is_mac || is_ios) {
   import("angle_perftests.gni")
 
   # This test suite is for perf tests that use ANGLE's internals in some direct way.
@@ -283,7 +284,7 @@ if (is_win || is_linux || is_chromeos || is_android || is_mac) {
 
     # These tests depend on vulkan_command_buffer_utils, which is
     # not yet compatible with mac
-    if (angle_enable_vulkan && !is_mac) {
+    if (angle_enable_vulkan && !is_mac && !is_ios) {
       sources += angle_white_box_perf_tests_vulkan_sources
       deps += [
         "$angle_glslang_dir:glslang_lib_sources",
@@ -383,7 +384,7 @@ if (build_angle_gles1_conform_tests) {
     ]
 
     # This is used by the tests to typedef uint32_t. For some reason only needed on mac.
-    if (is_mac) {
+    if (is_mac || is_ios) {
       defines += [ "__linux" ]
     }
 
@@ -584,7 +585,7 @@ if (build_angle_gles1_conform_tests) {
     ]
   }
 
-  if (!is_win && !is_mac) {
+  if (!is_win && !is_mac && !is_ios) {
     source_set("angle_gles1_covgl_no_gtest") {
       configs += [
         ":angle_gles1_conform_support",
@@ -886,7 +887,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
       # This has to be GNU_SOURCE as on Linux dEQP uses syscall()
       defines += [ "_GNU_SOURCE" ]
     }
-    if (is_android || is_mac) {
+    if (is_android || is_mac || is_ios) {
       # _XOPEN_SOURCE=600 is what is used in deqp/src/Android.mk
       defines += [ "_XOPEN_SOURCE=600" ]
     }
@@ -1017,7 +1018,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
     if (is_win) {
       sources += deqp_framework_delibs_sources_win
     }
-    if (is_linux || is_chromeos || is_android || is_mac) {
+    if (is_linux || is_chromeos || is_android || is_mac || is_ios) {
       sources += deqp_framework_delibs_sources_unix
     }
 
@@ -1455,7 +1456,7 @@ group("angle_tests") {
       ":angle_gles1_covegl_no_gtest",
       ":angle_gles1_primtest_tests",
     ]
-    if (!is_win && !is_mac) {
+    if (!is_win && !is_mac && !is_ios) {
       deps += [ ":angle_gles1_covgl_tests" ]
     }
   }

util/BUILD.gn

@@ -184,11 +184,11 @@ foreach(is_shared_library,
       ]
     }
 
-    if (is_mac) {
-      frameworks = [
-        "AppKit.framework",
-        "QuartzCore.framework",
-      ]
+    if (is_mac || is_ios) {
+      frameworks = [ "QuartzCore.framework" ]
+      if (is_mac) {
+        frameworks += [ "AppKit.framework" ]
+      }
     }
 
     if (is_android) {
@@ -221,7 +221,7 @@ foreach(is_shared_library,
 
       public_deps += [ ":angle_util_loader" ]
 
-      if (is_mac && !is_component_build) {
+      if ((is_ios || is_mac) && !is_component_build) {
         ldflags = [
           "-install_name",
           "@rpath/libangle_util.dylib",