diff options
| author | David Neto <dneto@google.com> | 2016-12-13 12:16:42 -0500 |
|---|---|---|
| committer | David Neto <dneto@google.com> | 2016-12-13 12:44:43 -0500 |
| commit | cea581f35f25531b412b6bba1462319824bee404 (patch) | |
| tree | 88bdd96bebc48e763cdca0b9d33fb4b4c9dcd8e5 | |
| parent | b252c470366118af0db2b4395217bedffb4c2e01 (diff) | |
| parent | c470b68225a04965bf87d35e143ae92f831e8110 (diff) | |
| download | spirv-headers-cea581f35f25531b412b6bba1462319824bee404.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into update-shaderc
Includes the following:
c470b68 Merge pull request #26 from dneto0/register-shaderc-glslang-frontend
7e4d3ef Add "Shaderc over Glslang" as a front end
Test: Linux x86-64 build; ran Windows unit tests
Change-Id: I3c87a1eabb16cf3f2f9f3d831fa199bcdf09d700
| -rw-r--r-- | include/spirv/spir-v.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/spirv/spir-v.xml b/include/spirv/spir-v.xml index 7f08814..f688db6 100644 --- a/include/spirv/spir-v.xml +++ b/include/spirv/spir-v.xml @@ -62,7 +62,8 @@ <id value="10" vendor="AMD" comment="Contact Daniel Rakos, daniel.rakos@amd.com"/> <id value="11" vendor="Intel" comment="Contact Alexey, alexey.bader@intel.com"/> <id value="12" vendor="Imagination" comment="Contact James Jones"/> - <unused start="13" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/> + <id value="13" vendor="Google" tool="Shaderc over Glslang" comment="Contact David Neto, dneto@google.com"/> + <unused start="14" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/> </ids> <!-- SECTION: SPIR-V Opcodes and Enumerants --> |