diff options
| author | David Neto <dneto@google.com> | 2016-11-30 13:47:17 -0500 |
|---|---|---|
| committer | David Neto <dneto@google.com> | 2016-11-30 13:58:30 -0500 |
| commit | b252c470366118af0db2b4395217bedffb4c2e01 (patch) | |
| tree | 50389a22d1a3784cba1dcad63c2ccc13efbec10e | |
| parent | e9f7d8ac3cda59f2637776eea1dfad0e171fba21 (diff) | |
| parent | bd47a9abaefac00be692eae677daed1b977e625c (diff) | |
| download | spirv-headers-deqp-dev.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into update-shadercandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-preview-2android-o-mr1-preview-1master-plus-llvmdeqp-dev
Includes the following:
bd47a9a Add Imagination as a vendor and reserve an enum range for them.
Test: checkbuild.py on Linux x86; unit tests on Windows
Change-Id: I4c03de66c7e8e2170a2bdfeffaba125ec543571e
| -rw-r--r-- | include/spirv/spir-v.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/spirv/spir-v.xml b/include/spirv/spir-v.xml index ba22f9b..7f08814 100644 --- a/include/spirv/spir-v.xml +++ b/include/spirv/spir-v.xml @@ -61,7 +61,8 @@ <id value="9" vendor="Qualcomm" comment="Contact weifengz@qti.qualcomm.com"/> <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"/> - <unused start="12" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/> + <id value="12" vendor="Imagination" comment="Contact James Jones"/> + <unused start="13" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/> </ids> <!-- SECTION: SPIR-V Opcodes and Enumerants --> @@ -94,7 +95,7 @@ <ids type="opcode" start="4480" end="4991" vendor="Qualcomm" comment="Contact weifengz@qti.qualcomm.com"/> <ids type="opcode" start="4992" end="5247" vendor="AMD"/> <ids type="opcode" start="5248" end="5503" vendor="NVIDIA"/> - + <ids type="opcode" start="5504" end="5567" vendor="Imagination"/> <!-- Opcodes & enumerants reservable for future use. To get a block, allocate multiples of 64 starting at the lowest available point in this block and add a corresponding <ids> tag immediately above. Make |