Title: [207619] trunk/Source/WebCore
- Revision
- 207619
- Author
- clo...@igalia.com
- Date
- 2016-10-20 08:57:25 -0700 (Thu, 20 Oct 2016)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (207618 => 207619)
--- trunk/Source/WebCore/ChangeLog 2016-10-20 15:00:43 UTC (rev 207618)
+++ trunk/Source/WebCore/ChangeLog 2016-10-20 15:57:25 UTC (rev 207619)
@@ -1,3 +1,18 @@
+2016-10-20 Carlos Alberto Lopez Perez <clo...@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.fu...@sony.com>
[CMake] CMake does not support the dep files for implicit dependency
Modified: trunk/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp (207618 => 207619)
--- trunk/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp 2016-10-20 15:00:43 UTC (rev 207618)
+++ trunk/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp 2016-10-20 15:57:25 UTC (rev 207619)
@@ -66,6 +66,7 @@
wl_registry_add_listener(m_registry.get(), &s_registryListener, this);
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")) {
if (auto* getPlatformDisplay = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(eglGetProcAddress("eglGetPlatformDisplay")))
@@ -74,6 +75,7 @@
if (auto* getPlatformDisplay = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(eglGetProcAddress("eglGetPlatformDisplayEXT")))
m_eglDisplay = getPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR, m_display, nullptr);
} else
+#endif
m_eglDisplay = eglGetDisplay(m_display);
PlatformDisplay::initializeEGLDisplay();
Modified: trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp (207618 => 207619)
--- trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2016-10-20 15:00:43 UTC (rev 207618)
+++ trunk/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp 2016-10-20 15:57:25 UTC (rev 207619)
@@ -65,6 +65,7 @@
#if USE(EGL)
void PlatformDisplayX11::initializeEGLDisplay()
{
+#if defined(EGL_KHR_platform_x11)
const char* extensions = eglQueryString(nullptr, EGL_EXTENSIONS);
if (GLContext::isExtensionSupported(extensions, "EGL_KHR_platform_base")) {
if (auto* getPlatformDisplay = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(eglGetProcAddress("eglGetPlatformDisplay")))
@@ -73,11 +74,12 @@
if (auto* getPlatformDisplay = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(eglGetProcAddress("eglGetPlatformDisplayEXT")))
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
{
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
