Title: [236353] releases/WebKitGTK/webkit-2.22/Source/ThirdParty/ANGLE
- Revision
- 236353
- Author
- ape...@igalia.com
- Date
- 2018-09-21 13:11:49 -0700 (Fri, 21 Sep 2018)
Log Message
Merge r236349 - [GTK] ANGLE's eglplatform.h does not support Wayland-only builds
https://bugs.webkit.org/show_bug.cgi?id=189844
Reviewed by Michael Catanzaro.
This makes it possible to build WebKitGTK+ after r225340 when the
build is configured to support only Wayland, and the X11 headers
are not present.
* changes.diff: Updated.
* include/EGL/eglplatform.h: 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.22/Source/ThirdParty/ANGLE/ChangeLog (236352 => 236353)
--- releases/WebKitGTK/webkit-2.22/Source/ThirdParty/ANGLE/ChangeLog 2018-09-21 20:07:02 UTC (rev 236352)
+++ releases/WebKitGTK/webkit-2.22/Source/ThirdParty/ANGLE/ChangeLog 2018-09-21 20:11:49 UTC (rev 236353)
@@ -1,3 +1,19 @@
+2018-09-21 Adrian Perez de Castro <ape...@igalia.com>
+
+ [GTK] ANGLE's eglplatform.h does not support Wayland-only builds
+ https://bugs.webkit.org/show_bug.cgi?id=189844
+
+ Reviewed by Michael Catanzaro.
+
+ This makes it possible to build WebKitGTK+ after r225340 when the
+ build is configured to support only Wayland, and the X11 headers
+ are not present.
+
+ * changes.diff: Updated.
+ * include/EGL/eglplatform.h: 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.
+
2018-08-03 Alex Christensen <achristen...@webkit.org>
Fix spelling of "overridden"
Modified: releases/WebKitGTK/webkit-2.22/Source/ThirdParty/ANGLE/changes.diff (236352 => 236353)
--- releases/WebKitGTK/webkit-2.22/Source/ThirdParty/ANGLE/changes.diff 2018-09-21 20:07:02 UTC (rev 236352)
+++ releases/WebKitGTK/webkit-2.22/Source/ThirdParty/ANGLE/changes.diff 2018-09-21 20:11:49 UTC (rev 236353)
@@ -8079,3 +8079,31 @@
typedef intptr_t EGLNativeDisplayType;
typedef intptr_t EGLNativeWindowType;
+diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
+index 47d18093c96..e781564891d 100644
+--- a/include/EGL/eglplatform.h
++++ b/include/EGL/eglplatform.h
+@@ -114,6 +114,8 @@ typedef struct wl_egl_window *EGLNativeWindowType;
+
+ #elif defined(__unix__)
+
++#if defined(ANGLE_USE_X11) && !defined(MESA_EGL_NO_X11_HEADERS)
++
+ /* X11 (tentative) */
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+@@ -122,6 +124,14 @@ typedef Display *EGLNativeDisplayType;
+ 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.22/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h (236352 => 236353)
--- releases/WebKitGTK/webkit-2.22/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h 2018-09-21 20:07:02 UTC (rev 236352)
+++ releases/WebKitGTK/webkit-2.22/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h 2018-09-21 20:11:49 UTC (rev 236353)
@@ -114,6 +114,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>
@@ -123,6 +125,14 @@
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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
