Changeset 207619 in webkit

Timestamp:

Oct 20, 2016, 8:57:25 AM (10 years ago)

Author:

clopez@igalia.com

Message:

[GTK] Build fix after r207616
​https://bugs.webkit.org/show_bug.cgi?id=163333

Reviewed by Carlos Garcia Campos.

EGL_PLATFORM_X11_KHR and EGL_PLATFORM_WAYLAND_KHR are not defined
on the EGL headers shipped by Mesa 10.3 (shipped by Debian 8)

• platform/graphics/wayland/PlatformDisplayWayland.cpp:

(WebCore::PlatformDisplayWayland::initialize):

• platform/graphics/x11/PlatformDisplayX11.cpp:

(WebCore::PlatformDisplayX11::initializeEGLDisplay):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/wayland/PlatformDisplayWayland.cpp (modified) (2 diffs)
• platform/graphics/x11/PlatformDisplayX11.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-20  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [GTK] Build fix after r207616
+        https://bugs.webkit.org/show_bug.cgi?id=163333
+
+        Reviewed by Carlos Garcia Campos.
+
+        EGL_PLATFORM_X11_KHR and EGL_PLATFORM_WAYLAND_KHR are not defined
+        on the EGL headers shipped by Mesa 10.3 (shipped by Debian 8)
+
+        * platform/graphics/wayland/PlatformDisplayWayland.cpp:
+        (WebCore::PlatformDisplayWayland::initialize):
+        * platform/graphics/x11/PlatformDisplayX11.cpp:
+        (WebCore::PlatformDisplayX11::initializeEGLDisplay):
+
 2016-10-20  Fujii Hironori  <Hironori.Fujii@sony.com>
 

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

@@ -67 +67 @@
     wl_display_roundtrip(m_display);
 
+#if defined(EGL_KHR_platform_wayland)
     const char* extensions = eglQueryString(nullptr, EGL_EXTENSIONS);
     if (GLContext::isExtensionSupported(extensions, "EGL_KHR_platform_base")) {
@@ -75 +76 @@
             m_eglDisplay = getPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR, m_display, nullptr);
     } else
+#endif
         m_eglDisplay = eglGetDisplay(m_display);
 

trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp

@@ -66 +66 @@
 void PlatformDisplayX11::initializeEGLDisplay()
 {
+#if defined(EGL_KHR_platform_x11)
     const char* extensions = eglQueryString(nullptr, EGL_EXTENSIONS);
     if (GLContext::isExtensionSupported(extensions, "EGL_KHR_platform_base")) {
@@ -74 +75 @@
             m_eglDisplay = getPlatformDisplay(EGL_PLATFORM_X11_KHR, m_display, nullptr);
     } else
+#endif
         m_eglDisplay = eglGetDisplay(m_display);
 
     PlatformDisplay::initializeEGLDisplay();
 }
-#endif
+#endif // USE(EGL)
 
 bool PlatformDisplayX11::supportsXComposite() const