Bug 118550 - ANGLE should be updated
Summary: ANGLE should be updated
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: ANGLE (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P3 Normal
Assignee: Alex Christensen
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-07-10 23:44 PDT by Alex Christensen
Modified: 2013-07-23 15:34 PDT (History)
19 users (show)

See Also:


Attachments
Patch (737.00 KB, patch)
2013-07-11 00:16 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff
Patch (1.81 MB, patch)
2013-07-12 12:38 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff
Patch (737.08 KB, patch)
2013-07-12 16:30 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff
Patch (733.69 KB, patch)
2013-07-13 15:28 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff
Patch (736.89 KB, patch)
2013-07-13 15:44 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff
changes I made to ANGLE before running bison (4.37 KB, application/octet-stream)
2013-07-15 13:40 PDT, Alex Christensen
no flags Details
Patch (692.05 KB, patch)
2013-07-15 16:31 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff
Patch (691.47 KB, patch)
2013-07-15 17:07 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff
Patch (672.69 KB, patch)
2013-07-15 18:19 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff
Patch (739.37 KB, patch)
2013-07-22 16:36 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff
Patch (2.45 MB, patch)
2013-07-22 17:19 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff
Patch (2.45 MB, patch)
2013-07-22 17:45 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff
Patch (2.45 MB, patch)
2013-07-23 11:05 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff
Patch (2.45 MB, patch)
2013-07-23 13:14 PDT, Alex Christensen
dino: review+
commit-queue: commit-queue-
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alex Christensen 2013-07-10 23:44:24 PDT
I have a working build of WebGL on Windows that uses most of ANGLE, so we should included the additional parts of ANGLE.  Before we do this, we may as well update to the latest revision.  

Blink is currently using r2184 of ANGLE.  We're currently using r1987.  I suggest we update to the latest revision of ANGLE, r2249.

Our current differences from the ANGLE repository are that we used Bison 2.4.2 instead of Bison 2.3 to generate glslang_tab and ExpressionParser cpp and h files, we put #if defined(_MSC_VER) around #pragma warning(disable: 4718) in DependencyGraph.cpp, and we include khrplatform.h instead of KHR/khrplatform.h in ShaderLang.h.  The current revision of ANGLE used Bison 2.4.2 to generate the files, so we won't need to rerun Bison.  We may as well keep the other two changes for now.

Updating to the latest revision moves DetectRecursion.cpp and DetectRecursion.h to DetectCallDepth.cpp and DetectCallDepth.h and adds builtin_symbol_table.cpp and builtin_symbol_table.h, so I've tried to do that by hand with all build systems.  "DetectRecursion" was also in Source\WebCore\WebCore.order, and I'm not sure what that is, so I may have broken whatever that is (Stephanie - you added that).  I would not be surprised if this first patch breaks build systems, but that's what the EWS system is for.  I don't want to land a patch that breaks anything.
Comment 1 Alex Christensen 2013-07-11 00:16:29 PDT
Created attachment 206429 [details]
Patch
Comment 2 kov's GTK+ EWS bot 2013-07-11 00:28:27 PDT
Comment on attachment 206429 [details]
Patch

Attachment 206429 [details] did not pass gtk-ews (gtk):
Output: http://webkit-queues.appspot.com/results/931496
Comment 3 Build Bot 2013-07-11 00:39:58 PDT
Comment on attachment 206429 [details]
Patch

Attachment 206429 [details] did not pass mac-wk2-ews (mac-wk2):
Output: http://webkit-queues.appspot.com/results/1026461
Comment 4 Build Bot 2013-07-11 00:54:28 PDT
Comment on attachment 206429 [details]
Patch

Attachment 206429 [details] did not pass mac-ews (mac):
Output: http://webkit-queues.appspot.com/results/1058082
Comment 5 Alex Christensen 2013-07-12 12:38:11 PDT
Created attachment 206566 [details]
Patch
Comment 6 Build Bot 2013-07-12 13:16:45 PDT
Comment on attachment 206566 [details]
Patch

Attachment 206566 [details] did not pass mac-ews (mac):
Output: http://webkit-queues.appspot.com/results/1067030
Comment 7 kov's GTK+ EWS bot 2013-07-12 13:23:19 PDT
Comment on attachment 206566 [details]
Patch

Attachment 206566 [details] did not pass gtk-ews (gtk):
Output: http://webkit-queues.appspot.com/results/1067031
Comment 8 Alex Christensen 2013-07-12 16:30:32 PDT
Created attachment 206579 [details]
Patch
Comment 9 kov's GTK+ EWS bot 2013-07-12 16:35:56 PDT
Comment on attachment 206579 [details]
Patch

Attachment 206579 [details] did not pass gtk-ews (gtk):
Output: http://webkit-queues.appspot.com/results/1064222
Comment 10 Martin Robinson 2013-07-12 20:31:01 PDT
The build error on GTK+ is due to the combination of the bitfields with the enum. I haven't yet determined if this is a bug in gcc yet, but I did confirm that making the enums members sans bitfields fixed the issue.
Comment 11 Alex Christensen 2013-07-13 15:28:52 PDT
Created attachment 206620 [details]
Patch
Comment 12 EFL EWS Bot 2013-07-13 15:32:02 PDT
Comment on attachment 206620 [details]
Patch

Attachment 206620 [details] did not pass efl-ews (efl):
Output: http://webkit-queues.appspot.com/results/970772
Comment 13 EFL EWS Bot 2013-07-13 15:33:53 PDT
Comment on attachment 206620 [details]
Patch

Attachment 206620 [details] did not pass efl-wk2-ews (efl-wk2):
Output: http://webkit-queues.appspot.com/results/1045681
Comment 14 Early Warning System Bot 2013-07-13 15:35:15 PDT
Comment on attachment 206620 [details]
Patch

Attachment 206620 [details] did not pass qt-ews (qt):
Output: http://webkit-queues.appspot.com/results/1066395
Comment 15 Early Warning System Bot 2013-07-13 15:36:27 PDT
Comment on attachment 206620 [details]
Patch

Attachment 206620 [details] did not pass qt-wk2-ews (qt-wk2):
Output: http://webkit-queues.appspot.com/results/1069137
Comment 16 Alex Christensen 2013-07-13 15:44:08 PDT
Created attachment 206622 [details]
Patch
Comment 17 Alex Christensen 2013-07-13 16:21:07 PDT
This is the workaround I did for getting Types.h to compile with GCC:

+#ifdef __GNUC__
+    TBasicType type;
+    TPrecision precision;
+    TQualifier qualifier;
+#else
     TBasicType type      : 6;
     TPrecision precision;
     TQualifier qualifier : 7;
+#endif

Running webgl tests on Mac doesn't add any failures with this patch, and running Safari with this patch seems to render webgl fine.
Comment 18 Dean Jackson 2013-07-15 13:25:27 PDT
Comment on attachment 206622 [details]
Patch

We explicitly use the older Bison so that we don't commit code with a license that is incompatible with WebKit's terms. You'll need to regenerate the files with the older Bison.
Comment 19 Dean Jackson 2013-07-15 13:31:26 PDT
i.e. use Bison 2.3, not 2.4x

Otherwise it all looks good.
Comment 20 Alex Christensen 2013-07-15 13:40:28 PDT
Created attachment 206683 [details]
changes I made to ANGLE before running bison
Comment 21 Alex Christensen 2013-07-15 16:31:03 PDT
Created attachment 206700 [details]
Patch
Comment 22 Early Warning System Bot 2013-07-15 16:35:49 PDT
Comment on attachment 206700 [details]
Patch

Attachment 206700 [details] did not pass qt-ews (qt):
Output: http://webkit-queues.appspot.com/results/1067846
Comment 23 Early Warning System Bot 2013-07-15 16:36:54 PDT
Comment on attachment 206700 [details]
Patch

Attachment 206700 [details] did not pass qt-wk2-ews (qt-wk2):
Output: http://webkit-queues.appspot.com/results/1071599
Comment 24 kov's GTK+ EWS bot 2013-07-15 16:40:47 PDT
Comment on attachment 206700 [details]
Patch

Attachment 206700 [details] did not pass gtk-ews (gtk):
Output: http://webkit-queues.appspot.com/results/1073307
Comment 25 Build Bot 2013-07-15 16:54:34 PDT
Comment on attachment 206700 [details]
Patch

Attachment 206700 [details] did not pass mac-wk2-ews (mac-wk2):
Output: http://webkit-queues.appspot.com/results/1071600
Comment 26 Alex Christensen 2013-07-15 17:07:07 PDT
Created attachment 206705 [details]
Patch
Comment 27 Alex Christensen 2013-07-15 18:19:13 PDT
Created attachment 206713 [details]
Patch
Comment 28 Dean Jackson 2013-07-16 16:03:48 PDT
Comment on attachment 206713 [details]
Patch

rs=me
Comment 29 WebKit Commit Bot 2013-07-16 22:33:00 PDT
Comment on attachment 206713 [details]
Patch

Clearing flags on attachment: 206713

Committed r152755: <http://trac.webkit.org/changeset/152755>
Comment 30 WebKit Commit Bot 2013-07-16 22:33:05 PDT
All reviewed patches have been landed.  Closing bug.
Comment 31 Dean Jackson 2013-07-20 15:25:36 PDT
Rolled out in https://trac.webkit.org/r152946
Comment 32 Alex Christensen 2013-07-22 16:36:38 PDT
Created attachment 207292 [details]
Patch
Comment 33 Alex Christensen 2013-07-22 16:41:11 PDT
This time I ran leaks tests and it doesn't add 4 million leaks
Comment 34 Build Bot 2013-07-22 16:41:26 PDT
Comment on attachment 207292 [details]
Patch

Attachment 207292 [details] did not pass mac-ews (mac):
Output: http://webkit-queues.appspot.com/results/1092434
Comment 35 EFL EWS Bot 2013-07-22 16:47:01 PDT
Comment on attachment 207292 [details]
Patch

Attachment 207292 [details] did not pass efl-ews (efl):
Output: http://webkit-queues.appspot.com/results/1082683
Comment 36 Early Warning System Bot 2013-07-22 16:47:07 PDT
Comment on attachment 207292 [details]
Patch

Attachment 207292 [details] did not pass qt-ews (qt):
Output: http://webkit-queues.appspot.com/results/1172159
Comment 37 Early Warning System Bot 2013-07-22 16:47:56 PDT
Comment on attachment 207292 [details]
Patch

Attachment 207292 [details] did not pass qt-wk2-ews (qt-wk2):
Output: http://webkit-queues.appspot.com/results/1177257
Comment 38 EFL EWS Bot 2013-07-22 16:53:09 PDT
Comment on attachment 207292 [details]
Patch

Attachment 207292 [details] did not pass efl-wk2-ews (efl-wk2):
Output: http://webkit-queues.appspot.com/results/1092437
Comment 39 Build Bot 2013-07-22 17:01:51 PDT
Comment on attachment 207292 [details]
Patch

Attachment 207292 [details] did not pass mac-wk2-ews (mac-wk2):
Output: http://webkit-queues.appspot.com/results/1082681
Comment 40 Alex Christensen 2013-07-22 17:19:49 PDT
Created attachment 207296 [details]
Patch
Comment 41 Early Warning System Bot 2013-07-22 17:33:02 PDT
Comment on attachment 207296 [details]
Patch

Attachment 207296 [details] did not pass qt-wk2-ews (qt-wk2):
Output: http://webkit-queues.appspot.com/results/1135460
Comment 42 EFL EWS Bot 2013-07-22 17:37:17 PDT
Comment on attachment 207296 [details]
Patch

Attachment 207296 [details] did not pass efl-wk2-ews (efl-wk2):
Output: http://webkit-queues.appspot.com/results/1137488
Comment 43 kov's GTK+ EWS bot 2013-07-22 17:42:37 PDT
Comment on attachment 207296 [details]
Patch

Attachment 207296 [details] did not pass gtk-ews (gtk):
Output: http://webkit-queues.appspot.com/results/1137489
Comment 44 Alex Christensen 2013-07-22 17:45:42 PDT
Created attachment 207298 [details]
Patch
Comment 45 kov's GTK+ EWS bot 2013-07-22 17:58:48 PDT
Comment on attachment 207298 [details]
Patch

Attachment 207298 [details] did not pass gtk-ews (gtk):
Output: http://webkit-queues.appspot.com/results/1184016
Comment 46 Alex Christensen 2013-07-23 10:45:59 PDT
I'm pretty sure my patch didn't break the GTK build because the error has nothing to do with ANGLE and GTK-WK2 built successfully.  I also ran leak tests locally with this patch and it does not add 4 million leaks like the last one did.
Comment 47 Alex Christensen 2013-07-23 11:05:21 PDT
Created attachment 207338 [details]
Patch
Comment 48 Early Warning System Bot 2013-07-23 11:20:08 PDT
Comment on attachment 207338 [details]
Patch

Attachment 207338 [details] did not pass qt-wk2-ews (qt-wk2):
Output: http://webkit-queues.appspot.com/results/1119317
Comment 49 kov's GTK+ EWS bot 2013-07-23 11:59:11 PDT
Comment on attachment 207338 [details]
Patch

Attachment 207338 [details] did not pass gtk-ews (gtk):
Output: http://webkit-queues.appspot.com/results/1183293
Comment 50 Alex Christensen 2013-07-23 13:14:21 PDT
Created attachment 207343 [details]
Patch
Comment 51 Dean Jackson 2013-07-23 14:44:58 PDT
Comment on attachment 207343 [details]
Patch

rs=me
Comment 52 WebKit Commit Bot 2013-07-23 15:12:56 PDT
Comment on attachment 207343 [details]
Patch

Rejecting attachment 207343 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 207343, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Last 500 characters of output:
/git.webkit.org/WebKit
   576a5fb..9ce069c  master     -> origin/master
Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ...
Currently at 153061 = 576a5fb847db0f1a9dd8fb3db2d257c8f2d817c5
r153062 = 9ce069c97e2f045384ba83f8d8c96113820779de
Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc
First, rewinding head to replay your work on top of it...
Fast-forwarded master to refs/remotes/origin/master.

Full output: http://webkit-queues.appspot.com/results/1158437
Comment 53 Alex Christensen 2013-07-23 15:34:27 PDT
r153064