diff options
| author |  Brian Osman <brianosman@google.com> | 2018-05-07 09:50:10 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-07 15:07:40 +0000 |
| commit | c3b0822d50e48439febebe176b092295c8f61621 (patch) | |
| tree | de1bb70162ce2a911911637676879bb7d37308f9 | |
| parent | 76e9485ffd718cc32bbf479cf02cdb9f6787c1f8 (diff) | |
Roll third_party/externals/angle2/ d7b56642c..983460e6c (3 commits)
Manual roll including GN fix for renamed file.
---
https://chromium.googlesource.com/angle/angle.git/+log/d7b56642c9f7..983460e6cd51
$ git log d7b56642c..983460e6c --date=short --no-merges --format='%ad %ae %s'
2018-05-02 oetuaho Rewrite repeated assignments to swizzled vectors on NVIDIA
2018-04-28 jiawei.shao ES31: Add link validation on MAX_COMBINED_SHADER_OUTPUT_RESOURCES
2018-05-02 brandon1.jones Autogenerate libGLESv2.cpp and .def
Created with:
roll-dep third_party/externals/angle2
The AutoRoll server is located here: https://angle-skia-roll.skia.org
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Debian9-Clang-x86_64-Release-ANGLE;skia.primary:Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE
Change-Id: I41f4cace265952ae898a7c60b345b60510979fdd
Reviewed-on: https://skia-review.googlesource.com/126421
Commit-Queue: Brian Osman <brianosman@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | third_party/angle2/BUILD.gn | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -3,7 +3,7 @@ use_relative_paths = True deps = { "buildtools" : "https://chromium.googlesource.com/chromium/buildtools.git@505de88083136eefd056e5ee4ca0f01fe9b33de8", "common" : "https://skia.googlesource.com/common.git@9737551d7a52c3db3262db5856e6bcd62c462b92", - "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@d7b56642c9f788f7485582f878bcb04dcc31d463", + "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@983460e6cd51b4b51bd1363b75324f99e7161c7b", "third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@96443b262250c390b0caefbf3eed8463ba35ecae", "third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-6.0.1_r55", "third_party/externals/freetype" : "https://skia.googlesource.com/third_party/freetype2.git@fa6da7bf6dcbcfa22d2464259ad1cccee3233189", diff --git a/third_party/angle2/BUILD.gn b/third_party/angle2/BUILD.gn index ab3afa58bf..33395d74e4 100644 --- a/third_party/angle2/BUILD.gn +++ b/third_party/angle2/BUILD.gn @@ -104,7 +104,7 @@ shared_library("libGLESv2") { ".", "$angle_root/src") if (!is_win) { - sources -= [ "$angle_root/src/libGLESv2/libGLESv2.def" ] + sources -= [ "$angle_root/src/libGLESv2/libGLESv2_autogen.def" ] } if (is_linux) { |