Bug 118815 – ANGLE needs a repeatable way to update

• Status: RESOLVED
• Resolution: FIXED
• Component: ANGLE

[Alex Christensen]

Created attachment 206915 [details]
changes made from ANGLE r2426

Updating ANGLE is a pain.  My update in r152755 was done by making changes to ANGLE, running Bison, undoing some of those changes, manually editing generated code, and copying files.  This process needs to be streamlined.

I've done a different fix to glslang.y that causes the generated files to not need manual editing.  Here's the process to reproduce these files:

1) Apply patch to make changes to ANGLE.
2) Execute these commands to run Bison:
        cd src/compiler
        ./generate_parser.sh
        cd preprocessor
        chmod 755 generate_parser.sh
        ./generate_parser.sh
3) Copy ANGLE files into webkit repository.

The next step is getting all builds to run Bison as part of the build so we can remove the generated files entirely.

[Alex Christensen]

Created attachment 206919 [details]
Patch

[WebKit Commit Bot]

Attachment 206919 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/ThirdParty/ANGLE/ChangeLog', u'Source/ThirdParty/ANGLE/src/compiler/glslang.y', u'Source/ThirdParty/ANGLE/src/compiler/glslang_lex.cpp', u'Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp', u'Source/ThirdParty/ANGLE/src/compiler/glslang_tab.h']" exit_code: 1
Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp:773:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp:774:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp:775:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp:776:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp:777:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp:778:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp:779:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Source/ThirdParty/ANGLE/src/compiler/glslang_tab.cpp:780:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Total errors found: 8 in 5 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Dean Jackson]

Comment on attachment 206919 [details]
Patch

I'd much prefer if this was done upstream, but let's land it for now and see if we can get ANGLE to adopt this or something like it.

[WebKit Commit Bot]

Comment on attachment 206919 [details]
Patch

Clearing flags on attachment: 206919

Committed r152821: <http://trac.webkit.org/changeset/152821>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Dean Jackson]

Rolled out in https://trac.webkit.org/r152946

[Alex Christensen]

This was included in r153064