Changeset 269841 in webkit

Timestamp:

Nov 16, 2020 2:05:32 AM (3 years ago)

Author:

zandobersek@gmail.com

Message:

PlatformDisplayLibWPE: use eglGetPlatformDisplay when possible
​https://bugs.webkit.org/show_bug.cgi?id=218941

Reviewed by Carlos Garcia Campos.

Use the existing wpe_renderer_backend_egl API to detect any desired
EGL platform that should be used to retrieve the global EGLDisplay
object. If such a platform is specified, the eglGetPlatformDisplay
entrypoing from the EGL_EXT_platform_base extension should be used
to retrieve the corresponding EGLDisplay.

If the API or the extension is not available, or if the EGLDisplay is
not retrieved this way, we fall back to eglGetDisplay.

• platform/graphics/libwpe/PlatformDisplayLibWPE.cpp:

(WebCore::PlatformDisplayLibWPE::initialize):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/libwpe/PlatformDisplayLibWPE.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-16  Zan Dobersek  <zdobersek@igalia.com>
+
+        PlatformDisplayLibWPE: use eglGetPlatformDisplay when possible
+        https://bugs.webkit.org/show_bug.cgi?id=218941
+
+        Reviewed by Carlos Garcia Campos.
+
+        Use the existing wpe_renderer_backend_egl API to detect any desired
+        EGL platform that should be used to retrieve the global EGLDisplay
+        object. If such a platform is specified, the eglGetPlatformDisplay
+        entrypoing from the EGL_EXT_platform_base extension should be used
+        to retrieve the corresponding EGLDisplay.
+
+        If the API or the extension is not available, or if the EGLDisplay is
+        not retrieved this way, we fall back to eglGetDisplay.
+
+        * platform/graphics/libwpe/PlatformDisplayLibWPE.cpp:
+        (WebCore::PlatformDisplayLibWPE::initialize):
+
 2020-11-10  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/platform/graphics/libwpe/PlatformDisplayLibWPE.cpp

@@ -47 +47 @@
 #include <wpe/wpe-egl.h>
 
+#ifndef EGL_EXT_platform_base
+#define EGL_EXT_platform_base 1
+typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list);
+#endif
+
 namespace WebCore {
 
@@ -71 +76 @@
     m_backend = wpe_renderer_backend_egl_create(hostFd);
 
-    m_eglDisplay = eglGetDisplay(wpe_renderer_backend_egl_get_native_display(m_backend));
+    EGLNativeDisplayType eglNativeDisplay = wpe_renderer_backend_egl_get_native_display(m_backend);
+
+#if WPE_CHECK_VERSION(1, 1, 0)
+    uint32_t eglPlatform = wpe_renderer_backend_egl_get_platform(m_backend);
+    if (eglPlatform) {
+        using GetPlatformDisplayType = PFNEGLGETPLATFORMDISPLAYEXTPROC;
+        GetPlatformDisplayType getPlatformDisplay =
+            [] {
+                const char* extensions = eglQueryString(nullptr, EGL_EXTENSIONS);
+                if (GLContext::isExtensionSupported(extensions, "EGL_EXT_platform_base")
+                    || GLContext::isExtensionSupported(extensions, "EGL_KHR_platform_base"))
+                    return reinterpret_cast<GetPlatformDisplayType>(eglGetProcAddress("eglGetPlatformDisplay"));
+                return GetPlatformDisplayType(nullptr);
+            }();
+
+        if (getPlatformDisplay)
+            m_eglDisplay = getPlatformDisplay(eglPlatform, eglNativeDisplay, nullptr);
+    }
+#endif
+
+    if (m_eglDisplay == EGL_NO_DISPLAY)
+        m_eglDisplay = eglGetDisplay(eglNativeDisplay);
     if (m_eglDisplay == EGL_NO_DISPLAY) {
         WTFLogAlways("PlatformDisplayLibWPE: could not create the EGL display: %s.", GLContextEGL::lastErrorString());