Changes between Version 6 and Version 7 of UpdatingANGLE


Ignore:
Timestamp:
Feb 11, 2020 8:40:36 AM (4 years ago)
Author:
Michael Catanzaro
Comment:

Update instructions for updating ANGLE

Legend:

Unmodified
Added
Removed
Modified
  • UpdatingANGLE

    v6 v7  
    11== Merging ANGLE from Upstream ==
    22
    3 There are some important things to do when pulling in a new revision of ANGLE.
    4 
    5 1. Add a note explaining that we are explicitly choosing the non-GPL license for distributing sources based on Bison 2.4+. Add the following text: "* Apple Note: For the avoidance of doubt, Apple elects to distribute this file under the terms of the BSD license." to the files:
    6   - glslang_tab.cpp
    7   - glslang_tab.h
    8   - ExpressionParser.cpp
    9 2. Update ANGLE.plist with the details of the version of ANGLE you are committing.
    10 3. Add preprocessor comments to allow ANGLE to build on older versions of clang. Basically, copy [http://trac.webkit.org/changeset/154223 this commit] (although we no longer run the bison generation step, so you only need to touch the .cpp files)
    11 4. Update ShaderLang.h to include "khrplatform.h" not "KHR/khrplatform.h"
    12 5. Define YY_NO_INPUT in Tokenizer.cpp
    13 6. Copy the change from [https://trac.webkit.org/changeset/225584/webkit this commit].
    14 7. Then whatever needs to be done to get it to compile on all ports (mostly avoiding clang warnings)
     3When pulling in a new revision of ANGLE, you must run the script [https://trac.webkit.org/browser/webkit/trunk/Source/ThirdParty/ANGLE/update-angle.sh Source/ThirdParty/ANGLE/update-angle.sh] and follow its instructions. This script will attempt to update to a new version of ANGLE without losing WebKit changes.
    154
    165== Fixing ANGLE Bugs ==
    176
    18 When fixing bugs in ANGLE, please create a new bug on Monorail (Google's bug tracker) and attach the patch applied to WebKit so that changes can eventually be merged upstream instead of maintained locally.
    19 
    20 https://bugs.chromium.org/p/angleproject/issues/list
     7When fixing bugs in ANGLE, please create a new bug on [https://bugs.chromium.org/p/angleproject/issues/list Monorail] (Google's bug tracker) and attach the patch applied to WebKit so that changes can eventually be merged upstream instead of maintained locally. Be sure to update [https://trac.webkit.org/browser/webkit/trunk/Source/ThirdParty/ANGLE/changes.diff changes.diff] when committing downstream changes.