| commit | 07b132823683dfbd2ff06794fc056582427987f9 | [log] [tgz] |
|---|---|---|
| author | David Neto <dneto@google.com> | Tue Oct 24 17:08:00 2017 -0400 |
| committer | David Neto <dneto@google.com> | Tue Oct 24 17:10:19 2017 -0400 |
| tree | 0c50743e442d17721310b0aa718d72d850959ac1 | |
| parent | bf5277c84ee625b5786ef3392f31b16a08c340a1 [diff] | |
| parent | 061097878467b8e040fbf153a837d844ef9f9f96 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into update-shaderc Includes: 0610978 Add new Intel token reservations. 77240d9 Add new tokens for SPV_AMD_shader_fragment_mask, and rebuild all headers. b94aced Add new tokens for SPV_AMD_shader_fragment_mask Test: checkbuild.py on Linux; unit tests on Windows Change-Id: I9cc8b875f6278d14de264cc733307b2500cb2ab5