Bug 106274 – [ANGLE] Update ANGLE in WebKit

• Status: RESOLVED
• Resolution: FIXED
• Component: WebGL

[Max Vujovic]

Let's roll in the latest ANGLE sources.

[Max Vujovic]

Created attachment 181607 [details]
Patch (for bots, not for review)

Let's see what the bots dislike in this patch.

[Early Warning System Bot]

Comment on attachment 181607 [details]
Patch (for bots, not for review)

Attachment 181607 [details] did not pass qt-wk2-ews (qt):
Output: http://queues.webkit.org/results/15734909

[Early Warning System Bot]

Comment on attachment 181607 [details]
Patch (for bots, not for review)

Attachment 181607 [details] did not pass qt-ews (qt):
Output: http://queues.webkit.org/results/15735950

[EFL EWS Bot]

Comment on attachment 181607 [details]
Patch (for bots, not for review)

Attachment 181607 [details] did not pass efl-ews (efl):
Output: http://queues.webkit.org/results/15732931

[Max Vujovic]

Created attachment 181750 [details]
Patch (for bots, not for review)

[Early Warning System Bot]

Comment on attachment 181750 [details]
Patch (for bots, not for review)

Attachment 181750 [details] did not pass qt-ews (qt):
Output: http://queues.webkit.org/results/15762211

[Early Warning System Bot]

Comment on attachment 181750 [details]
Patch (for bots, not for review)

Attachment 181750 [details] did not pass qt-wk2-ews (qt):
Output: http://queues.webkit.org/results/15763232

[EFL EWS Bot]

Comment on attachment 181750 [details]
Patch (for bots, not for review)

Attachment 181750 [details] did not pass efl-ews (efl):
Output: http://queues.webkit.org/results/15758260

[Max Vujovic]

Created attachment 181947 [details]
Patch (for bots, not for review)

Attempt Qt bot fix.

[EFL EWS Bot]

Comment on attachment 181947 [details]
Patch (for bots, not for review)

Attachment 181947 [details] did not pass efl-ews (efl):
Output: http://queues.webkit.org/results/15758625

[Max Vujovic]

Created attachment 181983 [details]
Patch (for bots, not for review)

Attempt EFL build fix. Refactor Qt build fix.

[EFL EWS Bot]

Comment on attachment 181983 [details]
Patch (for bots, not for review)

Attachment 181983 [details] did not pass efl-ews (efl):
Output: http://queues.webkit.org/results/15762670

[Raphael Kubo da Costa (:rakuco)]

(In reply to comment #12)
> (From update of attachment 181983 [details])
> Attachment 181983 [details] did not pass efl-ews (efl):
> Output: http://queues.webkit.org/results/15762670

It's failing because "${THIRDPARTY_DIR}/ANGLE/include" is part of WebCore_INCLUDE_DIRECTORIES, while ShaderLang.h ends up being included indirectly in Source/WebKit/efl.

You need to add that include directory to Source/WebKit/PlatformEfl.cmake (you may have to do that to WebKit2 too).

BTW, are you sure you need to include "${THIRDPARTY_DIR}/ANGLE/include/KHR" as well (I didn't look at the whole patch)?

[Max Vujovic]

(In reply to comment #13)
> (In reply to comment #12)
> > (From update of attachment 181983 [details] [details])
> > Attachment 181983 [details] [details] did not pass efl-ews (efl):
> > Output: http://queues.webkit.org/results/15762670
> 
> It's failing because "${THIRDPARTY_DIR}/ANGLE/include" is part of WebCore_INCLUDE_DIRECTORIES, while ShaderLang.h ends up being included indirectly in Source/WebKit/efl.
> 
> You need to add that include directory to Source/WebKit/PlatformEfl.cmake (you may have to do that to WebKit2 too).

Ah ok. I will give that a try tomorrow.

> 
> BTW, are you sure you need to include "${THIRDPARTY_DIR}/ANGLE/include/KHR" as well (I didn't look at the whole patch)?

No, including KHR directly is wrong, but I figured I'd try it just in case :). I will remove it from the next patch.

Thanks for the help!

[Max Vujovic]

Created attachment 182174 [details]
Patch (for bots, not for review)

Attempt EFL fix. Add "${THIRDPARTY_DIR}/ANGLE/include" to PlatformEfl.cmake in WebKit and WebKit2.

[Max Vujovic]

Created attachment 182208 [details]
Patch (ready for review)

Setting r?, but cq- because this patch will need to be landed manually due to bug 91556. 

Since this is a massive patch, I'll point out that the important details are described in:
- Source/ThirdParty/ANGLE/ChangeLog

I have additional small ChangeLog entries in:
- Source/WebCore/ChangeLog
- Source/WebKit/ChangeLog
- Source/WebKit2/ChangeLog

[Max Vujovic]

Created attachment 182209 [details]
Patch (ready for review)

Oops, uploaded the wrong patch. Uploading the right one now.

[Max Vujovic]

Manually committed r139665: http://trac.webkit.org/changeset/139665

[Dean Jackson]

Reopening to attach new patch.

[Dean Jackson]

Created attachment 182676 [details]
Attempted build fix - testing EWS

[Early Warning System Bot]

Comment on attachment 182676 [details]
Attempted build fix - testing EWS

Attachment 182676 [details] did not pass qt-ews (qt):
Output: http://queues.webkit.org/results/15872693

[Early Warning System Bot]

Comment on attachment 182676 [details]
Attempted build fix - testing EWS

Attachment 182676 [details] did not pass qt-wk2-ews (qt):
Output: http://queues.webkit.org/results/15868714

[Dean Jackson]

Committed http://trac.webkit.org/changeset/139702

But this broke the build :(

[Max Vujovic]

Dean and I made some build fixes this evening:

Fix internal Mac build: http://trac.webkit.org/changeset/139702
Fix Qt build: http://trac.webkit.org/changeset/139705
Fix EFL build: http://trac.webkit.org/changeset/139706
Fix GTK build: http://trac.webkit.org/changeset/139710

[Sergio Villar Senin]

(In reply to comment #24)
> Dean and I made some build fixes this evening:
> 
> Fix internal Mac build: http://trac.webkit.org/changeset/139702
> Fix Qt build: http://trac.webkit.org/changeset/139705
> Fix EFL build: http://trac.webkit.org/changeset/139706
> Fix GTK build: http://trac.webkit.org/changeset/139710


A clean build of GTK issues linking errors:

  CCLD     Programs/unittests/testwebhistoryitem
  CCLD     Programs/unittests/testwindow
  CCLD     Programs/unittests/testdownload
./.libs/libwebkit2gtk-3.0.so: undefined reference to `VariablePacker::CheckVariablesWithinPackingLimits(int, std::vector<TVariableInfo, std::allocator<TVariableInfo> > const&)'
collect2: error: ld returned 1 exit status
make[1]: *** [Programs/WebKitWebProcess] Error 1
make[1]: *** Waiting for unfinished jobs....

[Sergio Villar Senin]

(In reply to comment #25)
> (In reply to comment #24)
> > Dean and I made some build fixes this evening:
> > 
> > Fix internal Mac build: http://trac.webkit.org/changeset/139702
> > Fix Qt build: http://trac.webkit.org/changeset/139705
> > Fix EFL build: http://trac.webkit.org/changeset/139706
> > Fix GTK build: http://trac.webkit.org/changeset/139710
> 
> 
> A clean build of GTK issues linking errors:
> 
>   CCLD     Programs/unittests/testwebhistoryitem
>   CCLD     Programs/unittests/testwindow
>   CCLD     Programs/unittests/testdownload
> ./.libs/libwebkit2gtk-3.0.so: undefined reference to `VariablePacker::CheckVariablesWithinPackingLimits(int, std::vector<TVariableInfo, std::allocator<TVariableInfo> > const&)'
> collect2: error: ld returned 1 exit status
> make[1]: *** [Programs/WebKitWebProcess] Error 1
> make[1]: *** Waiting for unfinished jobs....

Beh, mvujovic just told me about https://bugs.webkit.org/show_bug.cgi?id=106917

Thx for the fix.

[Max Vujovic]

(In reply to comment #26)
> (In reply to comment #25)
> > (In reply to comment #24)
> > > Dean and I made some build fixes this evening:
> > > 
> > > Fix internal Mac build: http://trac.webkit.org/changeset/139702
> > > Fix Qt build: http://trac.webkit.org/changeset/139705
> > > Fix EFL build: http://trac.webkit.org/changeset/139706
> > > Fix GTK build: http://trac.webkit.org/changeset/139710
> > 
> > 
> > A clean build of GTK issues linking errors:
> > 
> >   CCLD     Programs/unittests/testwebhistoryitem
> >   CCLD     Programs/unittests/testwindow
> >   CCLD     Programs/unittests/testdownload
> > ./.libs/libwebkit2gtk-3.0.so: undefined reference to `VariablePacker::CheckVariablesWithinPackingLimits(int, std::vector<TVariableInfo, std::allocator<TVariableInfo> > const&)'
> > collect2: error: ld returned 1 exit status
> > make[1]: *** [Programs/WebKitWebProcess] Error 1
> > make[1]: *** Waiting for unfinished jobs....
> 
> Beh, mvujovic just told me about https://bugs.webkit.org/show_bug.cgi?id=106917
> 
> Thx for the fix.

Sorry, should have linked that bug sooner. It just landed.

Fix GTK build, part 2: http://trac.webkit.org/changeset/139755

[David Kilzer (:ddkilzer)]

This updated ANGLE to upstream r1641 per Bug 106798 Comment #10.

Note that I also committed a fix to remove nonexistent files from the Xcode project in r139717.
<http://trac.webkit.org/changeset/139717>