Changeset 283301 in webkit

Timestamp:

Sep 29, 2021, 10:30:32 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

GPUP Cocoa GraphicsContextGLOpenGL should check for ANGLE presence
​https://bugs.webkit.org/show_bug.cgi?id=230946

Patch by Kimmo Kinnunen <​kkinnunen@apple.com> on 2021-09-29
Reviewed by Antti Koivisto.

For consistency, avoid crashing the GPUP mode when trying
to create GraphicsContextGLOpenGL when the ANGLE-shared dylib
is not present.

No new tests, refactor.

• platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:

(WebCore::isANGLEAvailable):
(WebCore::initializeEGLDisplay):
(WebCore::GraphicsContextGLOpenGL::create):
(WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
(WebCore::GraphicsContextGLOpenGL::makeContextCurrent):
(WebCore::InitializeEGLDisplay): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-09-29  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        GPUP Cocoa GraphicsContextGLOpenGL should check for ANGLE presence
+        https://bugs.webkit.org/show_bug.cgi?id=230946
+
+        Reviewed by Antti Koivisto.
+
+        For consistency, avoid crashing the GPUP mode when trying
+        to create GraphicsContextGLOpenGL when the ANGLE-shared dylib
+        is not present.
+
+        No new tests, refactor.
+
+        * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
+        (WebCore::isANGLEAvailable):
+        (WebCore::initializeEGLDisplay):
+        (WebCore::GraphicsContextGLOpenGL::create):
+        (WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
+        (WebCore::GraphicsContextGLOpenGL::makeContextCurrent):
+        (WebCore::InitializeEGLDisplay): Deleted.
+
 2021-09-29  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm

@@ -60 +60 @@
 namespace WebCore {
 
+static bool isANGLEAvailable()
+{
+    return !!EGL_Initialize;
+}
+
 // In isCurrentContextPredictable() == true case this variable is accessed in single-threaded manner.
 // In isCurrentContextPredictable() == false case this variable is accessed from multiple threads but always sequentially
@@ -114 +119 @@
 }
 
-static ScopedEGLDefaultDisplay InitializeEGLDisplay(const GraphicsContextGLAttributes& attrs)
-{
+static ScopedEGLDefaultDisplay initializeEGLDisplay(const GraphicsContextGLAttributes& attrs)
+{
+    if (!isANGLEAvailable()) {
+        WTFLogAlways("Failed to load ANGLE shared library.");
+        return { };
+    }
+
     EGLint majorVersion = 0;
     EGLint minorVersion = 0;
@@ -181 +191 @@
 #endif
 
-static bool isANGLEAvailable()
-{
-    return !!EGL_Initialize;
-}
-
 RefPtr<GraphicsContextGLOpenGL> GraphicsContextGLOpenGL::create(GraphicsContextGLAttributes attrs, HostWindow* hostWindow)
 {
-    // If ANGLE is not loaded, we can fail immediately.
-    if (!isANGLEAvailable()) {
-        WTFLogAlways("ANGLE shared library was not loaded. Can't make GraphicsContextGL.");
-        return nullptr;
-    }
-
     // Make space for the incoming context if we're full.
     GraphicsContextGLOpenGLManager::sharedManager().recycleContextIfNecessary();
@@ -246 +245 @@
 #endif
 
-    m_displayObj = InitializeEGLDisplay(attrs);
+    m_displayObj = initializeEGLDisplay(attrs);
     if (!m_displayObj)
         return;
@@ -520 +519 @@
     if (currentContext == this)
         return true;
-    // Calling MakeCurrent is important to set volatile platform context. See InitializeEGLDisplay().
+    // Calling MakeCurrent is important to set volatile platform context. See initializeEGLDisplay().
     if (!EGL_MakeCurrent(m_displayObj, EGL_NO_SURFACE, EGL_NO_SURFACE, m_contextObj))
         return false;