Commits · 1f1b4ffeff1356cc474dd8b4f55189ade357c855 · Chen Yisong / angle

18 Mar, 2021 5 commits

Vulkan: Test render and sample the same texture but with different LOD · 1f1b4ffe

authored Mar 08, 2021

This simulates aztec ruin's usage. This works properly on native OpenGL
but generates validation error on vulkan backend and renders incorrect
as well.

Bug: b/175584609
Test: FramebufferTest_ES3.SampleFromAttachedTextureWithDifferentLOD
Change-Id: I402c205a1b625669cae29ee201dddd144e0dfbde
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2743797Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Tim Van Patten <timvp@google.com>
Commit-Queue: Charlie Lao <cclao@google.com>

1f1b4ffe

scripts: Ignore "rapidsjon/..." when checking includes · f201c9d2

authored Mar 17, 2021

These include stubs are given in the comments within
rapidjson.h and are preported as error by the presubmission
check.

Bug: angleproject:5765
Change-Id: Ic200a860de7337aefcd3bb0f82686d62a1349d89
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2765648Reviewed-by: Cody Northrop <cnorthrop@google.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Gert Wollny <gert.wollny@collabora.com>

f201c9d2

Roll Chromium from 60fea25f23e6 to e7ef5f7d0368 (472 revisions) · 57d8b3e1

authored Mar 18, 2021

https://chromium.googlesource.com/chromium/src.git/+log/60fea25f23e6..e7ef5f7d0368

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/chromium-angle-autoroll
Please CC timvp@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Changed dependencies
* build: https://chromium.googlesource.com/chromium/src/build.git/+log/37b76d6fba..17a38f4bb2
* testing: https://chromium.googlesource.com/chromium/src/testing/+log/2408fca90b..3b69bfd940
* third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/{catapult_..c730daef75
* tools/clang: https://chromium.googlesource.com/chromium/src/tools/clang.git/+log/752611e5f2..168ccba7af
* tools/luci-go: git_revision:19175e196dd495f6e092845f7d777cb5bf157b3e..git_revision:ea8dc31395c76b2990112b29b02386628d795d2d
* tools/luci-go: git_revision:19175e196dd495f6e092845f7d777cb5bf157b3e..git_revision:ea8dc31395c76b2990112b29b02386628d795d2d
* tools/luci-go: git_revision:19175e196dd495f6e092845f7d777cb5bf157b3e..git_revision:ea8dc31395c76b2990112b29b02386628d795d2d
* tools/mb: https://chromium.googlesource.com/chromium/src/tools/mb/+log/67f01522b1..c98db359fc
* tools/skia_goldctl/linux: 3T-SUsozYAVsudk5nd48kjHvfpos6egORLB8s7ElE8oC..NQmBkXHpEXJthTy0c6iuXDk1UgYDyQ7Fm649E7P38bAC
* tools/skia_goldctl/mac: TPtcrf_XH3mB9pdK4W3N0QPZunsqJ08T7U7fWPvMnRAC..Rbel_7KQuxv_-SIkB3oT43MBYgKlr3AUwFystGNHKJ8C
* tools/skia_goldctl/win: wr5p_MyXcHVxA-eHznijCeFaqR2HUo02Hw70e0CWCIoC..3sDKbIeT1dc4BYnE_uMfW71xbKa-b75KWLUwVEIJF-QC
No update to Clang.

Bug: angleproject:2424,angleproject:2880,angleproject:2994,angleproject:3033,angleproject:3753,angleproject:4377,angleproject:5014
Tbr: timvp@google.com
Change-Id: Ib964474c19e613fedb9ab3ac0d474fc1829289ab
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2770687
Commit-Queue: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>
Bot-Commit: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>

57d8b3e1

Roll vulkan-deps from 105af117f053 to 6ea3512e6349 (13 revisions) · 39296f39

authored Mar 18, 2021

https://chromium.googlesource.com/vulkan-deps.git/+log/105af117f053..6ea3512e6349

Changed dependencies:
* glslang: https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang.git/+log/b2e5b5c559..d18bcd64fa
* spirv-headers: https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git/+log/faa570afbc..bcf55210f1
* spirv-tools: https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git/+log/478754c005..4f498774db
* vulkan-validation-layers: https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers.git/+log/053e2bf22d..d5bf0be344

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/vulkan-deps-angle-autoroll
Please CC timvp@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Bug: None
Tbr: timvp@google.com
Change-Id: I190a577538fb3a2178c1e82f1c9fc4e52749a322
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2770144
Commit-Queue: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>
Bot-Commit: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>

39296f39

Fix immutable texture base level validation · bb7c1442

authored Mar 17, 2021

Jeff's new rendering feedback loop test
(https://github.com/KhronosGroup/WebGL/pull/3221) found a couple of
issues with texture base level validation. For immutable textures the
base level is clamped to the valid range, so setting an out of range
base level does not make an immutable texture sampler incomplete, and
we need to use the clamped value when checking for rendering feedback
loops.

Bug: angleproject:5768
Change-Id: Ie065709efd736f2cf75d4f980e8ac27999f80142
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2767901
Commit-Queue: James Darpinian <jdarpinian@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>

bb7c1442

17 Mar, 2021 7 commits

Tests: Add June's Journey trace · f6eccc20

authored Mar 12, 2021

Test: angle_perftests --gtest_filter="*junes_journey*"
TBR: jmadill@google.com,timvp@google.com
Bug: b/182566407
Bug: angleproject:5752
Change-Id: I083507949c9bc16bf701028a678540df9a3531dc
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2755840Reviewed-by: Cody Northrop <cnorthrop@google.com>
Commit-Queue: Cody Northrop <cnorthrop@google.com>

f6eccc20

Use bitset masks for active shader buffers. · 716b2cba

authored Mar 12, 2021

This switches the tracking for the uniform, shader storage, and atomic
counter buffers to use bitset masks to determine where there are
active buffers. This will make iterating these buffer sets faster.

Also renames the limit for atomic counter buffers to be consistent
with the other buffer types.

Also applies the implementation limit to atomic counter buffer
bindings. This fixes out-of-bounds access on some Linux platforms that
expose a large number of bindings.

Bug: angleproject:5736
Change-Id: Ice801645697592d1dda6aebf0cb69767594cc0c5
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2757509
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Tim Van Patten <timvp@google.com>

716b2cba

Reland "Vulkan: Support EXT_sRGB_write_control" · 81dcf078

authored Mar 08, 2021

This is a reland of 6073af53
with 2 changes -
1. Don't enable the extension even in nonConformant mode
2. Don't enable VK_KHR_image_format_list for swiftshader

Original change's description:
> Vulkan: Support EXT_sRGB_write_control
>
> Implement support for EXT_sRGB_write_control. This extension
> requires VK_KHR_image_format_list to be supported.
>
> The spec requires this functionality to work with glBlitFramebuffer
> as well but support for that will be added in a follow up change.
> As such, this extension is only exposed in non-conformant mode.
>
> Bug: angleproject:5075
> Tests: SRGBFramebufferTest.*Vulkan*
> Change-Id: I59b38f6cd810a3d0d67ec29f4f19c25f65f70862
> Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2617243
> Commit-Queue: Mohan Maiya <m.maiya@samsung.com>
> Reviewed-by: Jamie Madill <jmadill@chromium.org>
> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

Bug: angleproject:5075
Change-Id: I8e149d196a39c3c4769bfa8690792f3c53831299
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2762647Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Mohan Maiya <m.maiya@samsung.com>

81dcf078

Vulkan: Fix missing dirty bits for compute · 629f66ce

authored Mar 16, 2021

In the following scenario:

- Dispatch
- Flush outside render pass commands
- Dispatch

The second dispatch doesn't rebind the pipeline because it assumes it's
recording to the same primary command buffer.

This assumption is broken if another thread causes a submission before
the second dispatch.  It's also broken if using Vulkan secondary command
buffers.

Bug: b/181711029
Change-Id: I5335be95208f41724cf8e9c60ae5322ad91840fd
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2763143Reviewed-by: Ian Elliott <ianelliott@google.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

629f66ce

Roll SwiftShader from 69b79eec6533 to a98fb3f8380a (2 revisions) · 3eace05c

authored Mar 17, 2021

https://swiftshader.googlesource.com/SwiftShader.git/+log/69b79eec6533..a98fb3f8380a

2021-03-17 swiftshader.regress@gmail.com Regres: Update test lists @ a0aeb64e
2021-03-16 capn@google.com Fix multiview renderpass queries

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/swiftshader-angle-autoroll
Please CC timvp@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Bug: None
Tbr: timvp@google.com
Change-Id: I51bac967310d157a97f02dae659afd156973e565
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2766413
Bot-Commit: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>

3eace05c

Reland "Add support for Linux GPU info with Vulkan backend" · 9a839732

authored Mar 03, 2021

This is a reland of 5c09c1f8

Extra change: Add new ANGLE_HAS_VULKAN_SYSTEM_INFO compile
variable for GetSystemInfoVulkan() in linux platform.

Original change's description:
> Add support for Linux GPU info with Vulkan backend
>
> 1. Add support for Linux GPU info with vulkan backend: for
> dev board without PCI support, try vulkan backend to get
> GPU info.
> 2. Fix getVulkanInstance() issue when loading non-exist lib:
> return NULL instance if open lib failed.
>
> Bug: angleproject:5717
> Change-Id: I03c11da25a8787496d098f6c9d6b4c53701383e4
> Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2734375
> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
> Reviewed-by: Jamie Madill <jmadill@chromium.org>
> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Bug: angleproject:5717
Change-Id: Iaaab8f512b6ec1d524d7ebb3b4252fec3cfe7dc3
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2739097
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

9a839732

Roll Chromium from cffad6044951 to 60fea25f23e6 (481 revisions) · b3394db3

authored Mar 17, 2021

https://chromium.googlesource.com/chromium/src.git/+log/cffad6044951..60fea25f23e6

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/chromium-angle-autoroll
Please CC timvp@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Changed dependencies
* build: https://chromium.googlesource.com/chromium/src/build.git/+log/03e56ea015..37b76d6fba
* testing: https://chromium.googlesource.com/chromium/src/testing/+log/962db0501f..2408fca90b
* third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/{catapult_..629e117d9b
* tools/clang: https://chromium.googlesource.com/chromium/src/tools/clang.git/+log/91db20bec2..752611e5f2
* tools/luci-go: git_revision:fd10124659e991321df2f8a5d3749687b54ceb0a..git_revision:19175e196dd495f6e092845f7d777cb5bf157b3e
* tools/luci-go: git_revision:fd10124659e991321df2f8a5d3749687b54ceb0a..git_revision:19175e196dd495f6e092845f7d777cb5bf157b3e
* tools/luci-go: git_revision:fd10124659e991321df2f8a5d3749687b54ceb0a..git_revision:19175e196dd495f6e092845f7d777cb5bf157b3e
* tools/mb: https://chromium.googlesource.com/chromium/src/tools/mb/+log/e2946cfb97..67f01522b1
* tools/skia_goldctl/linux: jstGnw4Pyb9uiuH75QNEy3f6hJN7ET2TFiOVOUiMokcC..3T-SUsozYAVsudk5nd48kjHvfpos6egORLB8s7ElE8oC
* tools/skia_goldctl/mac: F9PFp7kNc3dn_X7b1PYmPsEb3VMHDY-8pXiZ7WNi09MC..TPtcrf_XH3mB9pdK4W3N0QPZunsqJ08T7U7fWPvMnRAC
* tools/skia_goldctl/win: 5QaZrGtCcd9HFM-qeg4vP-CrEpvhqlZtkfwAtVBee2oC..wr5p_MyXcHVxA-eHznijCeFaqR2HUo02Hw70e0CWCIoC
No update to Clang.

Bug: None
Tbr: timvp@google.com
Change-Id: I40046beb257703d83285249e3bd82d76e990b491
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2766582
Commit-Queue: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>
Bot-Commit: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>

b3394db3

16 Mar, 2021 8 commits

Remove usages of obsolete Mac bots · 27e12398

authored Mar 12, 2021

Bug: angleproject:4483
Change-Id: I9d4d94d42ddab26b40e780ad04479ac470af7a52
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2757517Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

27e12398

add cl entry points loader · 65586746

authored Mar 10, 2021

Bug: angleproject:5743
Change-Id: I61791f412e8dbc54878cd3791519ad1c4ee33399
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2749595Reviewed-by: Cody Northrop <cnorthrop@google.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: John Plate <jplate@google.com>

65586746

Fix download_restricted_traces.py :: run_command() · 522d609b

authored Mar 16, 2021

run_command() was using the undefined variable 'cmd', rather than the
pass in parameter 'command'.

Bug: angleproject:5210
Change-Id: I5e80869b18b717835217ad14a562bb4d223d52c4
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2765005Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Tim Van Patten <timvp@google.com>

522d609b

Disable timestamp queries for some GPUs on Android · c99e405c

authored Mar 12, 2021

Copy some workaround from chromium.

Bug: chromium:702980,chromium:477514,chromium:462553,chromium:1178333
Change-Id: I9acb6ef49c91193a9e6bb03c6fc5eabf336cba9a
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2756728
Commit-Queue: Peng Huang <penghuang@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>

c99e405c

Roll SwiftShader from 5cdf55ff2084 to 69b79eec6533 (1 revision) · 79e39478

authored Mar 16, 2021

https://swiftshader.googlesource.com/SwiftShader.git/+log/5cdf55ff2084..69b79eec6533

2021-03-15 adelva@google.com Disable named mmap usage for host/ndk Android

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/swiftshader-angle-autoroll
Please CC timvp@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Bug: None
Tbr: timvp@google.com
Change-Id: Ibdc669fee9d1bc6651d4afb234acbeda062c8ec2
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2762686
Bot-Commit: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>

79e39478

Roll vulkan-deps from d70f9e670332 to 105af117f053 (3 revisions) · a56d794f

authored Mar 16, 2021

https://chromium.googlesource.com/vulkan-deps.git/+log/d70f9e670332..105af117f053

Changed dependencies:
* glslang: https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang.git/+log/a36d91e5ac..b2e5b5c559
* vulkan-tools: https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools.git/+log/d1cd265394..27c2124822
* vulkan-validation-layers: https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers.git/+log/f648a59e1c..053e2bf22d

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/vulkan-deps-angle-autoroll
Please CC timvp@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Bug: None
Tbr: timvp@google.com
Change-Id: I59823bbe7db496bc83f54ce6c3dfc939f3b49e18
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2763789
Commit-Queue: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>
Bot-Commit: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>

a56d794f

Roll Chromium from 1572b5ac9572 to cffad6044951 (442 revisions) · 6936ee80

authored Mar 16, 2021

https://chromium.googlesource.com/chromium/src.git/+log/1572b5ac9572..cffad6044951

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/chromium-angle-autoroll
Please CC timvp@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Changed dependencies
* build: https://chromium.googlesource.com/chromium/src/build.git/+log/5f2e66e38e..03e56ea015
* testing: https://chromium.googlesource.com/chromium/src/testing/+log/c6aca9251c..962db0501f
* third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/{catapult_..8efb1d91dd
* tools/mb: https://chromium.googlesource.com/chromium/src/tools/mb/+log/cfcc45286b..e2946cfb97
* tools/skia_goldctl/mac: VUCuq1sveo1hxWfABmHwe-nXmh0OuWy4y9PhS3ykvykC..F9PFp7kNc3dn_X7b1PYmPsEb3VMHDY-8pXiZ7WNi09MC
* tools/skia_goldctl/win: j4rOmbVNLoVaUWWPvzH9y8NIrbGae5OxIInpCD89q0QC..5QaZrGtCcd9HFM-qeg4vP-CrEpvhqlZtkfwAtVBee2oC
No update to Clang.

Bug: None
Tbr: timvp@google.com
Change-Id: Ia5b632c384b8eaf2cca10e846d932c8a4e8858b9
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2763787
Commit-Queue: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>
Bot-Commit: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>

6936ee80

Skip plants_vs_zombies_2 on Windows+AMD · 687d3153

authored Mar 15, 2021

Step "angle_restricted_trace_gold_tests on ATI GPU on Windows on
Windows-10" failing on builder "Win10 FYI x64 Release (AMD RX 5500 XT)"

Bug: chromium:1187752
Change-Id: Ia48dd06c3e3aca66ff3194fc945e3c235fde85df
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2762645Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

687d3153

15 Mar, 2021 4 commits

Reland "Add support for building in Flutter Windows UWP configuration" · 06d194e2

authored Jan 10, 2021

This is a reland of 68ac4e43

Original change's description:
> Add support for building in Flutter Windows UWP configuration
>
> Bug: angleproject:5527
> Change-Id: Idf5a4cbb6f84b24fa2448157cab1b6a3bce4d8be
> Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2620580
> Reviewed-by: Jamie Madill <jmadill@chromium.org>
> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Bug: angleproject:5527
Change-Id: I3d5c3a35d73e3946ae40c779e76e0343039bf660
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2693639Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>

06d194e2

Roll vulkan-deps from ea8c29e1ee20 to d70f9e670332 (4 revisions) · a11d65a1

authored Mar 15, 2021

https://chromium.googlesource.com/vulkan-deps.git/+log/ea8c29e1ee20..d70f9e670332

Changed dependencies:
* spirv-cross: https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross.git/+log/60aa24566e..84d1f8aa2a
* spirv-tools: https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git/+log/5d8c40399e..478754c005

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/vulkan-deps-angle-autoroll
Please CC ianelliott@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Bug: None
Tbr: ianelliott@google.com
Change-Id: I919d629ed344528dce501fc3880147fb7640f808
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2760357
Bot-Commit: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>

a11d65a1

Roll SwiftShader from 3c4fd15fb075 to 5cdf55ff2084 (6 revisions) · 8edee520

authored Mar 15, 2021

https://swiftshader.googlesource.com/SwiftShader.git/+log/3c4fd15fb075..5cdf55ff2084

2021-03-13 capn@google.com Remove vkGetInstanceProcAddr from exported symbols on Fuchsia
2021-03-12 capn@google.com Remove vkGetInstanceProcAddr from exported symbols on Android
2021-03-12 natsu@google.com Handle semaphore update in vkAcquireImageANDROID
2021-03-12 natsu@google.com Update AHB default YUV range to NARROW
2021-03-12 capn@google.com Regres: Roll dEQP to 1.2.5.2-dev revision 288b9dd
2021-03-12 swiftshader.regress@gmail.com Regres: Update test lists @ 3c4fd15f

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/swiftshader-angle-autoroll
Please CC ianelliott@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Bug: None
Tbr: ianelliott@google.com
Change-Id: Ic2eec9679101fe9890fa4d0571f39c28f4cef04f
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2760258
Bot-Commit: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>

8edee520

Roll Chromium from e90a7a4d378a to 1572b5ac9572 (403 revisions) · 45ce8d1e

authored Mar 15, 2021

https://chromium.googlesource.com/chromium/src.git/+log/e90a7a4d378a..1572b5ac9572

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/chromium-angle-autoroll
Please CC ianelliott@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Changed dependencies
* build: https://chromium.googlesource.com/chromium/src/build.git/+log/8b3a30a92c..5f2e66e38e
* buildtools/linux64: git_revision:e0358b49272c8b354eda0a595e1d7887343fab27..git_revision:64b3b9401c1c3ed5f3c43c1cac00b91f83597ab8
* buildtools/mac: git_revision:e0358b49272c8b354eda0a595e1d7887343fab27..git_revision:64b3b9401c1c3ed5f3c43c1cac00b91f83597ab8
* buildtools/win: git_revision:e0358b49272c8b354eda0a595e1d7887343fab27..git_revision:64b3b9401c1c3ed5f3c43c1cac00b91f83597ab8
* testing: https://chromium.googlesource.com/chromium/src/testing/+log/09e6844f48..c6aca9251c
* third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/{catapult_..6e87bddf1b
* third_party/protobuf: https://chromium.googlesource.com/chromium/src/third_party/protobuf/+log/84a6931d87..5243354177
* tools/clang: https://chromium.googlesource.com/chromium/src/tools/clang.git/+log/e645571320..91db20bec2
* tools/mb: https://chromium.googlesource.com/chromium/src/tools/mb/+log/3164db0bf1..cfcc45286b
* tools/skia_goldctl/linux: B61Q7uQOsOlRtaowXXUUrD_eSjWCpiKEcrtjT3VFg-cC..jstGnw4Pyb9uiuH75QNEy3f6hJN7ET2TFiOVOUiMokcC
* tools/skia_goldctl/mac: RY1cs6o9Gi3j3iBE9XxPDZcR1n4Xvo27QvF_F3wL2r4C..VUCuq1sveo1hxWfABmHwe-nXmh0OuWy4y9PhS3ykvykC
No update to Clang.

Bug: angleproject:4483
Tbr: ianelliott@google.com
Change-Id: Ib54ef0294caddbd741ffe77f9d5259887292f648
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2759740
Commit-Queue: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>
Bot-Commit: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>

45ce8d1e

13 Mar, 2021 1 commit

Actually skip a flaky/timeout test · cd881848

authored Mar 12, 2021

Also, create SwANGLE KHR 3.1 expectations section

Bug: angleproject:5755
Change-Id: I902b3d3de0c3c4dd190d36c6b5f2def33420efc7
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2757125Reviewed-by: Ian Elliott <ianelliott@google.com>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Ian Elliott <ianelliott@google.com>

cd881848

12 Mar, 2021 13 commits

Create GN arg to enable non-conformant features · bbed8813

authored Mar 05, 2021

The GN arg angle_expose_non_conformant_extensions_and_versions is being
added to control exposeNonConformantExtensionsAndVersions, which enables
non-conformant features and extensions. In particular, this is being
done to enable EXT_texture_buffer on devices that don't support all of
the necessary formats since many Android games rely on this extension,
such as "Special Forces Group 2", "Fortnite", and "PUBG".

  # Enables non-conformant extensions and features
  angle_expose_non_conformant_extensions_and_versions = false

Users/vendors can now toggle the value with a GN arg, rather than a code
change, to make it easier to test the conformant version of ANGLE with
CTS, dEQP, etc. and/or app-compatibility.

Bug: angleproject:5592
Change-Id: Icbf18b48a2751c03e277ae964e1ec278a43324cf
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2740643Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Tim Van Patten <timvp@google.com>

bbed8813

Suppress flaky test on win-swangle · 191bee56

authored Mar 12, 2021

This test times out.  It takes a while on my underpowered Windows
laptop.

Bug: angleproject:5755
Change-Id: Id112c170a5e57c8e765dd94277ce0cf2801fae6d
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2757118Reviewed-by: Ian Elliott <ianelliott@google.com>
Commit-Queue: Ian Elliott <ianelliott@google.com>

191bee56

Micro-optimization for loading 3-channel images. · ca5dbef0

authored Mar 11, 2021

This reduced the total time spent in LoadToNative3To4 by 10% in our
micro-benchmark.

Test: passed the CQ dry run.
Bug: b/182513949
Change-Id: I5d1b1975f64e5b08bd0e65abc8f94fe62ef54321
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2752347
Commit-Queue: Pujun Lun <lunpujun@google.com>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

ca5dbef0

Suppress flaky EGL resize failure on Linux · 4f6d4d6f

authored Mar 12, 2021

Bug: angleproject:5753
Change-Id: I0bf716b09d329e9881bf5ca146ef6839d898a1b4
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2757107Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Ian Elliott <ianelliott@google.com>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

4f6d4d6f

Vulkan: Add test for UBO descriptor allocations. · 89d2a96a

authored Mar 09, 2021

This performance counter test verifies that re-binding the same
two buffers repeatedly doesn't allocate new descriptor sets. Currently
the test fails because we don't cache descriptor sets for UBOs.

Covers equivalent code patterns in Asphalt 9.

Reorganizes the perf counters collected for the program objects. Now
they are per-frame reset instead of cumulative. This tracking is now
consistent for the different counter types. In the future we can add
cumulative tracking for all per-object and global perf counters.

Bug: angleproject:5736
Change-Id: I23d04b6453e38af1cf4af7274d24382d136efad3
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2746176Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Tim Van Patten <timvp@google.com>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

89d2a96a

Remove old Mac bot from CQ · 4d7ea943

authored Mar 11, 2021

mac-angle-chromium-try + mac-angle-try replace mac-angle-rel,
adding dEQP testing on top of it

Bug: angleproject:4483
Change-Id: I477b3ef884e4e92c9ab11a55d7a8a3f4f4e0c02b
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2753491Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

4d7ea943

Vulkan: Use optimal tiling for AHB · 41a2672f

authored Sep 03, 2020

When running Android on certain GPUs, there are problems creating Vulkan
image siblings of AHardwareBuffers because it's currently assumed that
the underlying driver can create linear tiling images that have input
attachment usage, which isn't supported on NVIDIA for example, resulting
in failure to create the image siblings. Yet, we don't currently take
advantage of linear elsewhere in ANGLE. To maintain maximum
compatibility on Android for such drivers, use optimal tiling for image
siblings.

Note that while we have switched to optimal unconditionally in this path
versus linear, it's possible that previously compatible linear usages
might become uncompatible after switching to optimal. However, from what
we've seen on NVIDIA/AMD/Intel/Samsung GPUs so far, formats generally
have more possible usages in optimal tiling versus linear tiling:

http://vulkan.gpuinfo.org/displayreport.php?id=10804#formats_linear
http://vulkan.gpuinfo.org/displayreport.php?id=10804#formats_optimal

http://vulkan.gpuinfo.org/displayreport.php?id=10807#formats_linear
http://vulkan.gpuinfo.org/displayreport.php?id=10807#formats_optimal

http://vulkan.gpuinfo.org/displayreport.php?id=10809#formats_linear
http://vulkan.gpuinfo.org/displayreport.php?id=10809#formats_optimal

http://vulkan.gpuinfo.org/displayreport.php?id=10787#formats_linear
http://vulkan.gpuinfo.org/displayreport.php?id=10787#formats_optimal

Also, as an aside, in terms of what's generally expected from the Vulkan
ICD in Android when determining AHB compatibility, if the vendor wants
to declare a particular combinatino of format/tiling/usage/etc as not
supported AHB-wise, it's up to the ICD vendor to zero out bits in
supportedHandleTypes in the vkGetPhysicalDeviceImageFormatProperties2
query:

```
*
[VUID-VkImageCreateInfo-pNext-00990](https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.html#VUID-VkImageCreateInfo-pNext-00990)
If the pNext chain includes a VkExternalMemoryImageCreateInfo structure,
its handleTypes member must only contain bits that are also in
VkExternalImageFormatProperties::externalMemoryProperties.compatibleHandleTypes,
as returned by vkGetPhysicalDeviceImageFormatProperties2 with format,
imageType, tiling, usage, and flags equal to those in this structure,
and with a VkPhysicalDeviceExternalImageFormatInfo structure included in
the pNext chain, with a handleType equal to any one of the handle types
specified in VkExternalMemoryImageCreateInfo::handleTypes
```

Bug: angleproject:5709
Change-Id: I67b65ab830505a9df4665ccea8e2ba1ca409e0b5
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2729243Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Lingfeng Yang <lfy@google.com>

41a2672f

EGL: Add attribute check in ValidateQueryContext · cef5b717

authored Mar 11, 2021

Implementation of EGL_IMG_context_priority was
missing attribute check in ValidateQueryContext
Add test case.

Test: angle_end2end_test --gtest_filter=EGLCreateContextAttribsTest

Bug: angleproject:5746
Change-Id: Idf5df29fcb343d969a031675b6c5985a9be0a705
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2752891
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

cef5b717

Roll SwiftShader from a2fe8e1b2111 to 3c4fd15fb075 (2 revisions) · 5cc32fc9

authored Mar 12, 2021

https://swiftshader.googlesource.com/SwiftShader.git/+log/a2fe8e1b2111..3c4fd15fb075

2021-03-11 capn@google.com Implement timestamp query support
2021-03-11 srisser@google.com Expose Vulkan 1.2 support

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/swiftshader-angle-autoroll
Please CC ianelliott@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Bug: None
Tbr: ianelliott@google.com
Change-Id: Ib6b2cce9056177b7b490d650c3344351a010d3d5
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2756348
Bot-Commit: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>

5cc32fc9

Roll vulkan-deps from a4e10bfde719 to ea8c29e1ee20 (5 revisions) · bb034e05

authored Mar 12, 2021

https://chromium.googlesource.com/vulkan-deps.git/+log/a4e10bfde719..ea8c29e1ee20

Changed dependencies:
* spirv-tools: https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git/+log/77eb2b608e..5d8c40399e
* vulkan-validation-layers: https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers.git/+log/be60dd27b1..f648a59e1c

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/vulkan-deps-angle-autoroll
Please CC ianelliott@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Bug: None
Tbr: ianelliott@google.com
Change-Id: Ic58ad0ced49c9ba102605bd14d24dd5466d2ed4d
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2756088
Commit-Queue: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>
Bot-Commit: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>

bb034e05

Roll Chromium from 9e42f9e4abc6 to e90a7a4d378a (458 revisions) · b775012c

authored Mar 12, 2021

https://chromium.googlesource.com/chromium/src.git/+log/9e42f9e4abc6..e90a7a4d378a

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/chromium-angle-autoroll
Please CC ianelliott@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Changed dependencies
* build: https://chromium.googlesource.com/chromium/src/build.git/+log/cb067b2df4..8b3a30a92c
* buildtools: https://chromium.googlesource.com/chromium/src/buildtools.git/+log/368c7dd2c9..69cc9b8a3a
* buildtools/linux64: git_revision:dfcbc6fed0a8352696f92d67ccad54048ad182b3..git_revision:e0358b49272c8b354eda0a595e1d7887343fab27
* buildtools/mac: git_revision:dfcbc6fed0a8352696f92d67ccad54048ad182b3..git_revision:e0358b49272c8b354eda0a595e1d7887343fab27
* buildtools/win: git_revision:dfcbc6fed0a8352696f92d67ccad54048ad182b3..git_revision:e0358b49272c8b354eda0a595e1d7887343fab27
* testing: https://chromium.googlesource.com/chromium/src/testing/+log/32c9b4b55a..09e6844f48
* third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/{catapult_..cf138ce6bf
* third_party/zlib: https://chromium.googlesource.com/chromium/src/third_party/zlib/+log/348acca950..09490503d0
* tools/clang: https://chromium.googlesource.com/chromium/src/tools/clang.git/+log/e65f1a7cc3..e645571320
* tools/mb: https://chromium.googlesource.com/chromium/src/tools/mb/+log/4bd62b06a2..3164db0bf1
* tools/skia_goldctl/linux: X8zqgmHchz43Cvw6xwn3VRL5keLdpA3cD_DqweHLRqMC..B61Q7uQOsOlRtaowXXUUrD_eSjWCpiKEcrtjT3VFg-cC
* tools/skia_goldctl/mac: 9B5ePukmYbotGUjJuMV-DdjKGW5K0MtKrz8eOpXftu8C..RY1cs6o9Gi3j3iBE9XxPDZcR1n4Xvo27QvF_F3wL2r4C
* tools/skia_goldctl/win: tC_p4_R9hLfNMczJQbjawF5kzgXRVNF-XVcN7bJxrEYC..j4rOmbVNLoVaUWWPvzH9y8NIrbGae5OxIInpCD89q0QC
No update to Clang.

Bug: None
Tbr: ianelliott@google.com
Change-Id: I740c584e817bf2208aaf3f70211e101d8aa6f826
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2756087
Commit-Queue: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>
Bot-Commit: angle-autoroll <angle-autoroll@skia-public.iam.gserviceaccount.com>

b775012c

Tests: Add Plants vs. Zombies 2 trace · 225e1952

authored Mar 11, 2021

Test: angle_perftests --gtest_filter="*plants_vs_zombies_2*"
TBR: jmadill@google.com,timvp@google.com
Bug: b/182512556
Bug: angleproject:5749
Change-Id: Ib6c279f49ac95964f34e430d311a49600928166b
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2752898Reviewed-by: Cody Northrop <cnorthrop@google.com>
Commit-Queue: Cody Northrop <cnorthrop@google.com>

225e1952

Revert "Update DEP actions for Python 3" · efbb5667

authored Mar 11, 2021

This reverts commit e44595f2.

Reason for revert: build/mac_toolchain.py still fails with my local Python 3.9. Let's not make this change until the top level Chromium DEPS file does.

Original change's description:
> Update DEP actions for Python 3
>
> build/mac_toolchain.py was fixed for Python 3 in
> https://crrev.com/c/2727724
>
> Bug: angleproject:5707
> Change-Id: I2f233157bedc3cc298250b8efc9bd68ac45cdc28
> Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2731707
> Reviewed-by: Jamie Madill <jmadill@chromium.org>
> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Bug: angleproject:5707
Change-Id: Ib955a6343d886d273d7e949815fba5366b169386
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2753335
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: James Darpinian <jdarpinian@chromium.org>

efbb5667

11 Mar, 2021 2 commits

Tests: Add Lineage M trace · d98e436a

authored Mar 11, 2021

Test: angle_perftests --gtest_filter="*lineage_m*"
TBR: jmadill@google.com,timvp@google.com
Bug: b/182491024
Bug: angleproject:5748
Change-Id: I901b68eef1ddac98ce6e1a4640e2b034d1027a45
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2752894Reviewed-by: Cody Northrop <cnorthrop@google.com>
Commit-Queue: Cody Northrop <cnorthrop@google.com>

d98e436a

Vulkan: Don't let glslang link shaders · cb5441ed

authored Mar 11, 2021

The translator outputs intermediate shaders for Vulkan that are later to
be modified by the SPIR-V transformer.  glslang has no business trying
to link them.

Bug: angleproject:5740
Change-Id: I9ae418f54b91312b5fd0ef794acbc46a40261a0e
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2753096
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Ian Elliott <ianelliott@google.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

cb5441ed