Bug 170980 – [WinCairo] Fix build break after updating ANGLE

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Fujii Hironori]

[WinCairo] Fix build break after updating ANGLE

WinCairo port has been broken by updating ANGLE (Bug 170941).
http://trac.webkit.org/changeset/215490

[Fujii Hironori]

Created attachment 307467 [details]
WIP patch

[Fujii Hironori]

Created attachment 307468 [details]
Patch

[Brent Fulgham]

Comment on attachment 307468 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=307468&action=review

It looks like dino already tried to fix a few of these things. Can you please update your patch to account for those conflicts? Otherwise I think this looks good!

> Source/ThirdParty/ANGLE/src/third_party/murmurhash/LICENSE:2
> +// domain. The author hereby disclaims copyright to this source code.

This is now conflicting with r215499.

> Source/ThirdParty/ANGLE/src/third_party/murmurhash/MurmurHash3.cpp:335
> +

This was landed in r215500.

> Source/ThirdParty/ANGLE/src/third_party/murmurhash/MurmurHash3.h:37
> +#endif // _MURMURHASH3_H_

This conflicts with r215500.

[Fujii Hironori]

Created attachment 307543 [details]
Patch

[Fujii Hironori]

Oops. AppleWin EWS failed:

> LINK : fatal error LNK1181: cannot open input file 'libEGL.lib' [C:\cygwin\home\buildbot\WebKit\WebKitBuild\Release\Source\WebKit\WebKit.vcxproj]

[Fujii Hironori]

Created attachment 307559 [details]
Patch

[Brent Fulgham]

Comment on attachment 307559 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=307559&action=review

I think this looks good, but I'm worried this might break GTK. Can you confirm?

Otherwise r=me.

> Source/ThirdParty/ANGLE/CMakeLists.txt:-45
> -    src/common/system_utils_linux.cpp

Where did this go? Shouldn't it move to PlatformGTK or somewhere, like you did for Mac and Windows?

> Source/WebCore/platform/graphics/PlatformDisplay.cpp:-192
> -#endif

Oh, nice!

[Fujii Hironori]

GTK port uses system ANGLE. So, no PlatformGTK.cmake. And, GTK EWS is green.

[Alex Christensen]

Comment on attachment 307559 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=307559&action=review

>> Source/ThirdParty/ANGLE/CMakeLists.txt:-45
>> -    src/common/system_utils_linux.cpp
> 
> Where did this go? Shouldn't it move to PlatformGTK or somewhere, like you did for Mac and Windows?

GTK port uses WebCore/CMakeLists.txt.  We need to remove this duplication, but they use ANGLE/libEGL/libGLESv2 differently than we do.  This is part of why we need to use the ANGLE renderer on Mac

[WebKit Commit Bot]

Comment on attachment 307559 [details]
Patch

Clearing flags on attachment: 307559

Committed r215585: <http://trac.webkit.org/changeset/215585>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Fujii Hironori]

wincairo-1 BuildBot cann't compile the new ANGLE, while wincairo-2 can.
I'm guessing VisualStudio 2015 Update 5 is needed for it.

> ..\..\Source\ThirdParty\ANGLE\src\libANGLE\renderer\Format_table_autogen.cpp(28): error C2131: expression did not evaluate to a constant
> C:\Users\Alex\Documents\WinCairoBot\win-cairo-release\build\Source\ThirdParty\ANGLE\src\libANGLE/renderer/Format.h(81): note: a non-constant (sub-)expression was encountered
> ..\..\Source\ThirdParty\ANGLE\src\libANGLE\renderer\Format_table_autogen.cpp(153): fatal error C1903: unable to recover from previous error(s); stopping compilation

[Alex Christensen]

As long as I'm updating, I updated my bot to Visual Studio 2017.  Works fine.