tree 3116550620911b4cc7b1c594178e79e2cee612ba
parent 1e3e33068116971fb27357ef5d167ac09667b7d1
parent 3a4dbdde9a9b2cf23736694ba70262dce27fbeaa
author David Neto <dneto@google.com> 1524003239 -0400
committer David Neto <dneto@google.com> 1524003273 -0400

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

Includes:
3a4dbdd Merge pull request #68 from dneto0/hlsl-decorate-string
14e335f SPV_GOOGLE_hlsl_functionality1 includes all of SPV_GOOGLE_decorate_string
12f8de9 Add tokens for SPV_EXT_descriptor_indexing.
757bcc0 Merge pull request #67 from jeffbolznv/partition_missing_extension
28c3ed1 Add missing 'extensions' for OpGroupNonUniformPartitionNV
567cf2f Add SPV_NV_shader_subgroup_partitioned to SPIR-V JSON
80b0a0c Merge pull request #66 from bashbaug/intel_enum_block
10335f3 reserve 2x SPIR-V enum blocks for upcoming Intel extensions
b13b3be Merge pull request #64 from antiagainst/add-extensions
edd0440 Add missing extensions on some symbols
9a97861 Merge pull request #63 from antiagainst/add-missing-extensions
728eb3f Add missing extensions for several symbols
9f6846f Merge pull request #62 from antiagainst/fix-extensions
4ece4a4 Add missing extension/capability requirements for some symbols

Change-Id: Ib2531d3e9d52ca58f51e91cdda1ce3c9533054cd
Testing: checkbuild.py on Linux; unit tests on Windows