Changeset 219446 in webkit
- Timestamp:
- Jul 13, 2017 2:21:52 AM (7 years ago)
- Location:
- trunk/Source/ThirdParty/ANGLE
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/ThirdParty/ANGLE/ChangeLog
r219082 r219446 1 2017-07-13 Adrian Perez de Castro <aperez@igalia.com> 2 3 eglplatform.h does not support Wayland 4 https://bugs.webkit.org/show_bug.cgi?id=163482 5 6 This makes it possible to build WebKitGTK+ when the target system has only Wayland support, 7 but no X11 (and therefore the X11 headers are not present). 8 9 Reviewed by Alex Christensen. 10 11 * include/EGL/eglplatform.h: Add Wayland typedefs when WL_EGL_PLATFORM is defined (for example 12 by including wayland-egl.h before including EGL/egl.h). Also, include the X11 headers only 13 when ANGLE_USE_X11 is defined and, for consistency with Mesa's version of the header, when 14 MESA_EGL_NO_X11_HEADERS is not defined. 15 1 16 2017-07-03 Andy Estes <aestes@apple.com> 2 17 -
trunk/Source/ThirdParty/ANGLE/changes.diff
r208136 r219446 559 559 framebufferFormatInfo.format)) != conversionSet.end()) 560 560 { 561 diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h 562 index 9bb75910ac0..ccaf7e6f343 100644 563 --- a/include/EGL/eglplatform.h 564 +++ b/include/EGL/eglplatform.h 565 @@ -89,6 +89,12 @@ typedef int EGLNativeDisplayType; 566 typedef void *EGLNativeWindowType; 567 typedef void *EGLNativePixmapType; 568 569 +#elif defined(WL_EGL_PLATFORM) 570 + 571 +typedef struct wl_display *EGLNativeDisplayType; 572 +typedef struct wl_egl_pixmap *EGLNativePixmapType; 573 +typedef struct wl_egl_window *EGLNativeWindowType; 574 + 575 #elif defined(__ANDROID__) || defined(ANDROID) 576 577 #include <android/native_window.h> 578 @@ -107,6 +113,8 @@ typedef intptr_t EGLNativePixmapType; 579 580 #elif defined(__unix__) 581 582 +#if defined(ANGLE_USE_X11) && !defined(MESA_EGL_NO_X11_HEADERS) 583 + 584 /* X11 (tentative) */ 585 #include <X11/Xlib.h> 586 #include <X11/Xutil.h> 587 @@ -116,6 +124,14 @@ typedef Pixmap EGLNativePixmapType; 588 typedef Window EGLNativeWindowType; 589 590 #else 591 + 592 +typedef void *EGLNativeDisplayType; 593 +typedef khronos_uintptr_t EGLNativePixmapType; 594 +typedef khronos_uintptr_t EGLNativeWindowType; 595 + 596 +#endif /* ANGLE_USE_X11 && !MESA_EGL_NO_X11_HEADERS */ 597 + 598 +#else 599 #error "Platform not recognized" 600 #endif 601 -
trunk/Source/ThirdParty/ANGLE/include/EGL/eglplatform.h
r216497 r219446 90 90 typedef void *EGLNativePixmapType; 91 91 92 #elif defined(WL_EGL_PLATFORM) 93 94 typedef struct wl_display *EGLNativeDisplayType; 95 typedef struct wl_egl_pixmap *EGLNativePixmapType; 96 typedef struct wl_egl_window *EGLNativeWindowType; 97 92 98 #elif defined(__ANDROID__) || defined(ANDROID) 93 99 … … 108 114 #elif defined(__unix__) 109 115 116 #if defined(ANGLE_USE_X11) && !defined(MESA_EGL_NO_X11_HEADERS) 117 110 118 /* X11 (tentative) */ 111 119 #include <X11/Xlib.h> … … 115 123 typedef Pixmap EGLNativePixmapType; 116 124 typedef Window EGLNativeWindowType; 125 126 #else 127 128 typedef void *EGLNativeDisplayType; 129 typedef khronos_uintptr_t EGLNativePixmapType; 130 typedef khronos_uintptr_t EGLNativeWindowType; 131 132 #endif /* ANGLE_USE_X11 && !MESA_EGL_NO_X11_HEADERS */ 117 133 118 134 #else
Note: See TracChangeset
for help on using the changeset viewer.