Bug 135126 - Add support for Wayland EGL to ANGLE's eglplatform.h
Summary: Add support for Wayland EGL to ANGLE's eglplatform.h
Status: RESOLVED INVALID
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Zan Dobersek
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-07-21 12:10 PDT by Zan Dobersek
Modified: 2014-07-22 11:34 PDT (History)
5 users (show)

See Also:


Attachments
Patch (1.42 KB, patch)
2014-07-21 12:13 PDT, Zan Dobersek
darin: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Zan Dobersek 2014-07-21 12:10:46 PDT
Add support for Wayland EGL to ANGLE's eglplatform.h
Comment 1 Zan Dobersek 2014-07-21 12:13:08 PDT
Created attachment 235237 [details]
Patch
Comment 2 WebKit Commit Bot 2014-07-21 12:14:13 PDT
Note that there are important steps to take when updating ANGLE. See http://trac.webkit.org/wiki/UpdatingANGLE
Comment 3 Martin Robinson 2014-07-21 12:28:04 PDT
Comment on attachment 235237 [details]
Patch

We shouldn't be using the eglplatform.h from the ANGLE library. Is this unavoidable?
Comment 4 Zan Dobersek 2014-07-21 12:54:53 PDT
As long as we're using ANGLE's headers, I believe it is.

Mesa's eglplatform.h is based off Khronos' version as well, with extra entries for additionally supported platforms.

Future ANGLE updates would possibly remove the Wayland platform typedefs, but it shouldn't be hard to re-add them.
Comment 5 Martin Robinson 2014-07-21 13:23:17 PDT
(In reply to comment #4)
> As long as we're using ANGLE's headers, I believe it is.
> 
> Mesa's eglplatform.h is based off Khronos' version as well, with extra entries for additionally supported platforms.
> 
> Future ANGLE updates would possibly remove the Wayland platform typedefs, but it shouldn't be hard to re-add them.

If possible we should use the version from the system, since that is the version of GL we will be using at runtime.
Comment 6 Zan Dobersek 2014-07-22 11:34:59 PDT
(In reply to comment #5)
> (In reply to comment #4)
> > As long as we're using ANGLE's headers, I believe it is.
> > 
> > Mesa's eglplatform.h is based off Khronos' version as well, with extra entries for additionally supported platforms.
> > 
> > Future ANGLE updates would possibly remove the Wayland platform typedefs, but it shouldn't be hard to re-add them.
> 
> If possible we should use the version from the system, since that is the version of GL we will be using at runtime.

OK, agreed.

This patch was necessary due to Source/ThirdParty/ANGLE/include being listed in the WebCore_INCLUDE_DIRECTORIES, so we ended up using ANGLE's eglplatform.h at compile-time.

I'll change the build rules so the ANGLESupport library will still be built with that inclusion directory (which is necessary) while the WebCore library won't include it anymore, falling back to system's eglplatform.h.