Merge branch 'main' into adoc-tmp
diff --git a/include/spirv/spir-v.xml b/include/spirv/spir-v.xml
index 01d1512..0b0c47d 100644
--- a/include/spirv/spir-v.xml
+++ b/include/spirv/spir-v.xml
@@ -97,7 +97,8 @@
<id value="44" vendor="Robert Konrad" tool="Kongruent" comment="Contact Robert Konrad, https://github.com/Kode/Kongruent"/>
<id value="45" vendor="Kitsunebi Games" tool="Nuvk SPIR-V Emitter and DLSL compiler" comment="Contact Luna Nielsen, luna@foxgirls.gay, https://github.com/Inochi2D/nuvk"/>
<id value="46" vendor="Nintendo" comment="Contact Steve Urquhart, steve.urquhart@ntd.nintendo.com"/>
- <unused start="47" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
+ <id value="47" vendor="ARM" comment="Contact Christopher Gautier, christopher.gautier@arm.com"/>
+ <unused start="48" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
</ids>
<!-- SECTION: SPIR-V Opcodes and Enumerants -->
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
index 48bc969..43a2ada 100644
--- a/include/spirv/unified1/spirv.core.grammar.json
+++ b/include/spirv/unified1/spirv.core.grammar.json
@@ -16112,6 +16112,7 @@
{
"enumerant" : "AtomicStorageOps",
"value" : 4445,
+ "capabilities" : [ "AtomicStorage" ],
"extensions" : [ "SPV_KHR_shader_atomic_counter_ops" ],
"version" : "None"
},
