Bug 135126 – Add support for Wayland EGL to ANGLE's eglplatform.h

• Status: RESOLVED
• Resolution: INVALID
• Component: New Bugs

[Zan Dobersek]

Add support for Wayland EGL to ANGLE's eglplatform.h

[Zan Dobersek]

Created attachment 235237 [details]
Patch

[WebKit Commit Bot]

Note that there are important steps to take when updating ANGLE. See http://trac.webkit.org/wiki/UpdatingANGLE

[Martin Robinson]

Comment on attachment 235237 [details]
Patch

We shouldn't be using the eglplatform.h from the ANGLE library. Is this unavoidable?

[Zan Dobersek]

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.

[Martin Robinson]

(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.

[Zan Dobersek]

(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.