tree 7488de0d234db0613a8671a45f337baf6928bf69
parent dbd09e0be713eaab4feba755471a32edc4d203f4
parent 807a0d9e2f4e176f75d62ac3c179c81800ec2608
author David Neto <dneto@google.com> 1482514289 -0500
committer David Neto <dneto@google.com> 1482517811 -0500

Merge remote-tracking branch 'aosp/upstream-master' into update-shaderc

Includes:
807a0d9 Merge pull request #640 from chaoc/modify-shader-ballot
f48faec PP: Non-functional: Make a proper class out of the atom <-> string mapping.
f200da8 Modify shader ballot extension by adding OpSubgroupReadInvocationKHR
224b1f7 PP: Support operator creation with token pasting.
0c4b7c9 PP: Rationalize names of tokens.
2dcdda9 Merge pull request #641 from chaoc/passthrough
906b0a3 Merge pull request #644 from hrydgard/override-warning-fixes
9a931b3 Fix a large number of warnings about inconsistent usage of 'override' produced by clang
907aabb PP: Non-functional: Only use string <-> atom mapping when needed.
54af2de PP: Non-functional: rationalize TPpToken.
1fbb9c1 PP: Non-functional: clean up, simplify, completely identical operation.
6e5acae Add support for SPV_NV_geometry_shader_passthrough
3c264ce Merge pull request #639 from hrydgard/master
7a21a11 Merge pull request #638 from chaoc/master
b8387c8 PP: Non-functional: Remove custom allocator and related improvements.
868746a Add option to make it possible not to build the executables
bfff871 PP: Add missing i64val code.
0ad6a4e Add support for SPV_NV_sample_mask_override_coverage
7583ed7 Merge remote-tracking branch 'refs/remotes/KhronosGroup/master'
432576f Build: Fix #633, add missing overrides.
0955b1c Merge pull request #637 from KhronosGroup/token-paste
e6cbc5b Merge pull request #624 from steve-lunarg/remapper-strip-removed
4ba444b Merge pull request #635 from steve-lunarg/sample-fix-2
059d46e Merge pull request #625 from jbeich/gcc6
d485e0b PP: Implement token pasting for PP identifiers.
a64ed3e HLSL: allow "sample" in expressions.
abf5057 Fix comment typo.
1e275c8 HLSL: More robust handling of bad shader input, catching a few more things.
dca93d6 Merge pull request #629 from null77/fix-unicode
cebd97e Change unicode dash to ASCII.
95abd28 Merge pull request #628 from null77/fix-cast-warn
3ec327c Fix size_t to int cast warnings.
297754c Remapper: remove debug info for IDs stripped in other passes
1bcb254 Add missing header and drop duplicate one

Test: checkbuild.py on Linux; ran unit tests on Windows
Change-Id: I322ac2f372c55d996887e41a214e370a14f5e352