| commit | e9f7d8ac3cda59f2637776eea1dfad0e171fba21 | [log] [tgz] |
|---|---|---|
| author | David Neto <dneto@google.com> | Wed Oct 12 11:41:58 2016 -0400 |
| committer | David Neto <dneto@google.com> | Wed Oct 12 12:21:17 2016 -0400 |
| tree | c9c6b85fb2a561fbce26ab175501ccb06e520713 | |
| parent | b4083a1e1fdc27e8242de12aa5ecc282b80a5f76 [diff] | |
| parent | e22d57b0f7d170bdcff8672eb3fb6cd5f5fd0f26 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into refresh-shaderc Includes the following commits: e22d57b Correct Revision numbers for previous commit. 5a06681 Update to Rev. 8 of 1.0 and Rev. 4 of 1.1. Includes enums for SPV_KHR_shader_draw_parameters. Test: checkbuild.py Linux, Windows; manually ran unit test on Windows Change-Id: I4a55d3caf3c2b8710b4d8006a6a3f50df4e87ae4