Summary: | [ANGLE] Update ANGLE in WebKit | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Max Vujovic <mvujovic> | ||||||||||||||||||
Component: | WebGL | Assignee: | Max Vujovic <mvujovic> | ||||||||||||||||||
Status: | RESOLVED FIXED | ||||||||||||||||||||
Severity: | Normal | CC: | achicu, ddkilzer, dino, eric.carlson, feature-media-reviews, gyuyoung.kim, igor.oliveira, jdiggs, laszlo.gombos, rakuco, svillar, tonikitoo, webkit-ews, webkit.review.bot | ||||||||||||||||||
Priority: | P2 | ||||||||||||||||||||
Version: | 528+ (Nightly build) | ||||||||||||||||||||
Hardware: | Unspecified | ||||||||||||||||||||
OS: | Unspecified | ||||||||||||||||||||
Bug Depends on: | |||||||||||||||||||||
Bug Blocks: | 106798 | ||||||||||||||||||||
Attachments: |
|
Description
Max Vujovic
2013-01-07 16:30:48 PST
Created attachment 181607 [details]
Patch (for bots, not for review)
Let's see what the bots dislike in this patch.
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 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 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 Created attachment 181750 [details]
Patch (for bots, not for review)
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 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 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 Created attachment 181947 [details]
Patch (for bots, not for review)
Attempt Qt bot fix.
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 Created attachment 181983 [details]
Patch (for bots, not for review)
Attempt EFL build fix. Refactor Qt build fix.
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 (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)? (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! 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.
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 Created attachment 182209 [details]
Patch (ready for review)
Oops, uploaded the wrong patch. Uploading the right one now.
Manually committed r139665: http://trac.webkit.org/changeset/139665 Reopening to attach new patch. Created attachment 182676 [details]
Attempted build fix - testing EWS
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 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 Committed http://trac.webkit.org/changeset/139702 But this broke the build :( 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 (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.... (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. (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 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> |