Bug 214897 - Roll ANGLE to 2020-07-28
Summary: Roll ANGLE to 2020-07-28
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebGL (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Kenneth Russell
URL:
Keywords: InRadar
Depends on: 212228 212717
Blocks: 126404 214945
  Show dependency treegraph
 
Reported: 2020-07-28 14:39 PDT by Kenneth Russell
Modified: 2020-07-29 16:30 PDT (History)
12 users (show)

See Also:


Attachments
Patch (9.96 MB, patch)
2020-07-28 18:37 PDT, Kenneth Russell
no flags Details | Formatted Diff | Diff
Patch (9.96 MB, patch)
2020-07-29 11:54 PDT, Kenneth Russell
no flags Details | Formatted Diff | Diff
Patch (9.96 MB, patch)
2020-07-29 12:49 PDT, Kenneth Russell
no flags Details | Formatted Diff | Diff
Patch (9.96 MB, patch)
2020-07-29 13:52 PDT, Kenneth Russell
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Kenneth Russell 2020-07-28 14:39:54 PDT
In order to pass more WebGL 2.0 conformance tests, in particular some sRGB-related ones, WebKit's snapshot of ANGLE must be rolled forward to pick up recent upstream fixes.
Comment 1 Kenneth Russell 2020-07-28 18:37:37 PDT
Created attachment 405432 [details]
Patch
Comment 2 EWS Watchlist 2020-07-28 18:39:55 PDT
Note that there are important steps to take when updating ANGLE. See http://trac.webkit.org/wiki/UpdatingANGLE
Comment 3 Kenneth Russell 2020-07-28 18:51:56 PDT
It looks like WinCairo doesn't build with USE(ZLIB) enabled.

Any ideas how to stub out the compression-related functions in Source/ThirdParty/ANGLE/third_party/zlib/google/ ? To date we haven't put WebKit-style USE(...) macros in that code.
Comment 4 Don Olmstead 2020-07-29 11:52:29 PDT
(In reply to Kenneth Russell from comment #3)
> It looks like WinCairo doesn't build with USE(ZLIB) enabled.
> 
> Any ideas how to stub out the compression-related functions in
> Source/ThirdParty/ANGLE/third_party/zlib/google/ ? To date we haven't put
> WebKit-style USE(...) macros in that code.

From the build output it can't find a z_const definition. We don't use stock zlib we actually use zlib-ng. There's a PR for adding back z_const, https://github.com/zlib-ng/zlib-ng/pull/704, that should fix it. I would need to apply that to our requirements repository for the build to get further.
Comment 5 Kenneth Russell 2020-07-29 11:54:30 PDT
Created attachment 405479 [details]
Patch
Comment 6 Kenneth Russell 2020-07-29 12:49:57 PDT
Created attachment 405488 [details]
Patch
Comment 7 Kenneth Russell 2020-07-29 12:51:52 PDT
Thanks Don for your suggestion. Was able to put in a local workaround for the missing z_const preprocessor definition in the newly-introduced zlib wrapper in this patch. Now working through link errors in the WinCairo build.
Comment 8 Kenneth Russell 2020-07-29 13:52:35 PDT
Created attachment 405495 [details]
Patch
Comment 9 Kenneth Russell 2020-07-29 14:29:47 PDT
Thanks achristensen@ for your review! Relieved that this is passing the WinCairo bot now.

Will wait for more EWS bots to complete before marking this CQ+.
Comment 10 Kenneth Russell 2020-07-29 15:35:30 PDT
Everything's green. mac-debug-wk1 is backed up and hasn't started yet but it was green on earlier patches. CQ'ing now.
Comment 11 EWS 2020-07-29 15:47:56 PDT
Committed r265064: <https://trac.webkit.org/changeset/265064>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 405495 [details].
Comment 12 Radar WebKit Bug Importer 2020-07-29 15:48:38 PDT
<rdar://problem/66296668>