Changeset 250903 in webkit

Timestamp:

Oct 9, 2019 1:45:39 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Wayland: do not use EGL_PLATFORM_WAYLAND_KHR with eglGetPlatformDisplayEXT
​https://bugs.webkit.org/show_bug.cgi?id=202689

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2019-10-09
Reviewed by Žan Doberšek.

Use EGL_PLATFORM_WAYLAND_EXT instead. It shouldn't really matter because both are the same value.

• platform/graphics/wayland/PlatformDisplayWayland.cpp:

(WebCore::PlatformDisplayWayland::initialize):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/wayland/PlatformDisplayWayland.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-10-09  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Wayland: do not use EGL_PLATFORM_WAYLAND_KHR with eglGetPlatformDisplayEXT
+        https://bugs.webkit.org/show_bug.cgi?id=202689
+
+        Reviewed by Žan Doberšek.
+
+        Use EGL_PLATFORM_WAYLAND_EXT instead. It shouldn't really matter because both are the same value.
+
+        * platform/graphics/wayland/PlatformDisplayWayland.cpp:
+        (WebCore::PlatformDisplayWayland::initialize):
+
 2019-10-09  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp

@@ -94 +94 @@
 
 #if USE(EGL)
+#if defined(EGL_KHR_platform_wayland) || defined(EGL_EXT_platform_wayland)
+    const char* extensions = eglQueryString(nullptr, EGL_EXTENSIONS);
 #if defined(EGL_KHR_platform_wayland)
-    const char* extensions = eglQueryString(nullptr, EGL_EXTENSIONS);
     if (GLContext::isExtensionSupported(extensions, "EGL_KHR_platform_base")) {
         if (auto* getPlatformDisplay = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(eglGetProcAddress("eglGetPlatformDisplay")))
             m_eglDisplay = getPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR, m_display, nullptr);
-    } else if (GLContext::isExtensionSupported(extensions, "EGL_EXT_platform_base")) {
+    }
+#endif
+#if defined(EGL_EXT_platform_wayland)
+    if (m_eglDisplay == EGL_NO_DISPLAY && GLContext::isExtensionSupported(extensions, "EGL_EXT_platform_base")) {
         if (auto* getPlatformDisplay = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(eglGetProcAddress("eglGetPlatformDisplayEXT")))
-            m_eglDisplay = getPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR, m_display, nullptr);
-    } else
+            m_eglDisplay = getPlatformDisplay(EGL_PLATFORM_WAYLAND_EXT, m_display, nullptr);
+    }
 #endif
+#endif
+    if (m_eglDisplay == EGL_NO_DISPLAY)
         m_eglDisplay = eglGetDisplay(m_display);