Allow GetSystemInfo to return false in CGL and EAGL backends.

This API is documented as returning false if information is incomplete, but this should not cause a failure to initialize ANGLE's Display. This change is a refinement of one made in WebKit's downstream copy of ANGLE, likely in support of forthcoming Macs with Apple Silicon, in https://bugs.webkit.org/show_bug.cgi?id=213479 . Bug: angleproject:4902 Change-Id: I40a664a5db67b2aa37f15617b1cbcc3119793ee0 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2324462Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Commit-Queue: Kenneth Russell <kbr@chromium.org>

Allow GetSystemInfo to return false in CGL and EAGL backends.
19a1943b · Kenneth Russell · Commit Bot · f3a38d97 · 19a1943b · 19a1943b
Commit 19a1943b authored Jul 28, 2020 by Kenneth Russell Committed by Commit Bot Jul 31, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 8 deletions

DisplayCGL.mm src/libANGLE/renderer/gl/cgl/DisplayCGL.mm +3 -4

DisplayEAGL.mm src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm +3 -4

No files found.
--- a/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm
+++ b/src/libANGLE/renderer/gl/cgl/DisplayCGL.mm
@@ -145,10 +145,9 @@ egl::Error DisplayCGL::initialize(egl::Display *display)
    mEGLDisplay = display;
    angle::SystemInfo info;
-    if (!angle::GetSystemInfo(&info))
+    // It's legal for GetSystemInfo to return false and thereby
-    {
+    // contain incomplete information.
-        return egl::EglNotInitialized() << "Unable to query ANGLE's SystemInfo.";
+    (void)angle::GetSystemInfo(&info);
-    }
    // This code implements the effect of the
    // disableGPUSwitchingSupport workaround in FeaturesGL.

--- a/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm
+++ b/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm
@@ -66,10 +66,9 @@ egl::Error DisplayEAGL::initialize(egl::Display *display)
    mEGLDisplay = display;
    angle::SystemInfo info;
-    if (!angle::GetSystemInfo(&info))
+    // It's legal for GetSystemInfo to return false and thereby
-    {
+    // contain incomplete information.
-        return egl::EglNotInitialized() << "Unable to query ANGLE's SystemInfo.";
+    (void)angle::GetSystemInfo(&info);
-    }
    mContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3];
    if (mContext == nullptr)