Enable Metal backend.

Metal will be secondary default backend after OpenGL for now. The tests will be enabled for metal in CL http://crrev.com/c/1906607. Bug: angleproject:2634 Change-Id: I109c641d749c2a207bbb7d500bc281ffb0b13848 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1906612 Commit-Queue: Le Hoang Quyen <le.hoang.q@gmail.com> Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>

Enable Metal backend.
deae1fce · Le Hoang Quyen · Commit Bot · 20f11f58 · deae1fce · deae1fce
Commit deae1fce authored Nov 09, 2019 by Le Hoang Quyen Committed by Commit Bot Nov 15, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 14 deletions

Display.cpp src/libANGLE/Display.cpp +1 -13

DisplayMtl.mm src/libANGLE/renderer/metal/DisplayMtl.mm +5 -1

No files found.
--- a/src/libANGLE/Display.cpp
+++ b/src/libANGLE/Display.cpp
@@ -184,14 +184,6 @@ EGLAttrib GetDisplayTypeFromEnvironment()
    }
 #endif
-#if defined(ANGLE_ENABLE_METAL)
-    if (rx::IsMetalDisplayAvailable())
-    {
-        return EGL_PLATFORM_ANGLE_TYPE_METAL_ANGLE;
-    }
-    // else fallthrough to below
-#endif
 #if defined(ANGLE_ENABLE_D3D11)
    return EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE;
 #elif defined(ANGLE_ENABLE_D3D9)
@@ -205,11 +197,7 @@ EGLAttrib GetDisplayTypeFromEnvironment()
    return EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE;
 #    endif
 #elif defined(ANGLE_ENABLE_METAL)
-    // If we reach this point, it means rx::IsMetalDisplayAvailable() return false
+    return EGL_PLATFORM_ANGLE_TYPE_METAL_ANGLE;
-    // and ANGLE_ENABLE_OPENGL is not defined.
-    // Use default type as a fallback. Just to please the compiler.
-    // CreateDisplayFromAttribs() will fail regardless.
-    return EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE;
 #elif defined(ANGLE_ENABLE_VULKAN)
    return EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE;
 #elif defined(ANGLE_ENABLE_NULL)

--- a/src/libANGLE/renderer/metal/DisplayMtl.mm
+++ b/src/libANGLE/renderer/metal/DisplayMtl.mm
@@ -24,7 +24,11 @@ namespace rx
 bool IsMetalDisplayAvailable()
 {
-    UNIMPLEMENTED();
+    // We only support macos 10.13+ and 11 for now. Since they are requirements for Metal 2.0.
+    if (ANGLE_APPLE_AVAILABLE_XCI(10.13, 13.0, 11))
+    {
+        return true;
+    }
    return false;
 }