Title: [219814] releases/WebKitGTK/webkit-2.16/Source/ThirdParty/ANGLE
- Revision
- 219814
- Author
- [email protected]
- Date
- 2017-07-24 04:09:06 -0700 (Mon, 24 Jul 2017)
Log Message
Merge r219446 - eglplatform.h does not support Wayland
https://bugs.webkit.org/show_bug.cgi?id=163482
This makes it possible to build WebKitGTK+ when the target system has only Wayland support,
but no X11 (and therefore the X11 headers are not present).
Reviewed by Alex Christensen.
* include/EGL/eglplatform.h: Add Wayland typedefs when WL_EGL_PLATFORM is defined (for example
by including wayland-egl.h before including EGL/egl.h). Also, include the X11 headers only
when ANGLE_USE_X11 is defined and, for consistency with Mesa's version of the header, when
MESA_EGL_NO_X11_HEADERS is not defined.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.16/Source/ThirdParty/ANGLE/ChangeLog (219813 => 219814)
--- releases/WebKitGTK/webkit-2.16/Source/ThirdParty/ANGLE/ChangeLog 2017-07-24 11:07:13 UTC (rev 219813)
+++ releases/WebKitGTK/webkit-2.16/Source/ThirdParty/ANGLE/ChangeLog 2017-07-24 11:09:06 UTC (rev 219814)
@@ -1,3 +1,18 @@
+2017-07-13 Adrian Perez de Castro <[email protected]>
+
+ eglplatform.h does not support Wayland
+ https://bugs.webkit.org/show_bug.cgi?id=163482
+
+ This makes it possible to build WebKitGTK+ when the target system has only Wayland support,
+ but no X11 (and therefore the X11 headers are not present).
+
+ Reviewed by Alex Christensen.
+
+ * include/EGL/eglplatform.h: Add Wayland typedefs when WL_EGL_PLATFORM is defined (for example
+ by including wayland-egl.h before including EGL/egl.h). Also, include the X11 headers only
+ when ANGLE_USE_X11 is defined and, for consistency with Mesa's version of the header, when
+ MESA_EGL_NO_X11_HEADERS is not defined.
+
2016-12-20 Tim Horton <[email protected]>
Remove an ANGLE Markdown file from the ANGLE target
Modified: releases/WebKitGTK/webkit-2.16/Source/ThirdParty/ANGLE/changes.diff (219813 => 219814)
--- releases/WebKitGTK/webkit-2.16/Source/ThirdParty/ANGLE/changes.diff 2017-07-24 11:07:13 UTC (rev 219813)
+++ releases/WebKitGTK/webkit-2.16/Source/ThirdParty/ANGLE/changes.diff 2017-07-24 11:09:06 UTC (rev 219814)
@@ -558,3 +558,44 @@
if (conversionSet.find(CopyConversion(textureFormatInfo.format,
framebufferFormatInfo.format)) != conversionSet.end())
{
+diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
+index 9bb75910ac0..ccaf7e6f343 100644
+--- a/include/EGL/eglplatform.h
++++ b/include/EGL/eglplatform.h
+@@ -89,6 +89,12 @@ typedef int EGLNativeDisplayType;
+ typedef void *EGLNativeWindowType;
+ typedef void *EGLNativePixmapType;
+
++#elif defined(WL_EGL_PLATFORM)
++
++typedef struct wl_display *EGLNativeDisplayType;
++typedef struct wl_egl_pixmap *EGLNativePixmapType;
++typedef struct wl_egl_window *EGLNativeWindowType;
++
+ #elif defined(__ANDROID__) || defined(ANDROID)
+
+ #include <android/native_window.h>
+@@ -107,6 +113,8 @@ typedef intptr_t EGLNativePixmapType;
+
+ #elif defined(__unix__)
+
++#if defined(ANGLE_USE_X11) && !defined(MESA_EGL_NO_X11_HEADERS)
++
+ /* X11 (tentative) */
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+@@ -116,6 +124,14 @@ typedef Pixmap EGLNativePixmapType;
+ typedef Window EGLNativeWindowType;
+
+ #else
++
++typedef void *EGLNativeDisplayType;
++typedef khronos_uintptr_t EGLNativePixmapType;
++typedef khronos_uintptr_t EGLNativeWindowType;
++
++#endif /* ANGLE_USE_X11 && !MESA_EGL_NO_X11_HEADERS */
++
++#else
+ #error "Platform not recognized"
+ #endif
+
Modified: releases/WebKitGTK/webkit-2.16/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h (219813 => 219814)
--- releases/WebKitGTK/webkit-2.16/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h 2017-07-24 11:07:13 UTC (rev 219813)
+++ releases/WebKitGTK/webkit-2.16/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h 2017-07-24 11:09:06 UTC (rev 219814)
@@ -89,6 +89,12 @@
typedef void *EGLNativeWindowType;
typedef void *EGLNativePixmapType;
+#elif defined(WL_EGL_PLATFORM)
+
+typedef struct wl_display *EGLNativeDisplayType;
+typedef struct wl_egl_pixmap *EGLNativePixmapType;
+typedef struct wl_egl_window *EGLNativeWindowType;
+
#elif defined(__ANDROID__) || defined(ANDROID)
#include <android/native_window.h>
@@ -107,6 +113,8 @@
#elif defined(__unix__)
+#if defined(ANGLE_USE_X11) && !defined(MESA_EGL_NO_X11_HEADERS)
+
/* X11 (tentative) */
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -128,6 +136,14 @@
typedef CALayer *EGLNativeWindowType;
#else
+
+typedef void *EGLNativeDisplayType;
+typedef khronos_uintptr_t EGLNativePixmapType;
+typedef khronos_uintptr_t EGLNativeWindowType;
+
+#endif /* ANGLE_USE_X11 && !MESA_EGL_NO_X11_HEADERS */
+
+#else
#error "Platform not recognized"
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
