Merge branch 'main' of github.com:KhronosGroup/SPIRV-Headers into hea…

…der_4_hlsl
Devsh-Graphics-Programming · Aug 13, 2024 · 719dc53 · 719dc53
2 parents dbf584b + f013f08
commit 719dc53
Show file tree

Hide file tree

Showing 16 changed files with 548 additions and 27 deletions.
diff --git a/include/spirv/spir-v.xml b/include/spirv/spir-v.xml
@@ -272,7 +272,8 @@
     <!-- Reserved memory operand bits -->
     <ids type="MemoryOperand" start="0" end="15" vendor="Khronos" comment="Reserved MemoryOperand bits, not available to vendors - see the SPIR-V Specification"/>
     <ids type="MemoryOperand" start="16" end="18" vendor="Intel" comment="Contact [email protected]"/>
-    <ids type="MemoryOperand" start="19" end="30" comment="Unreserved bits reservable for use by vendors"/>
+    <ids type="MemoryOperand" start="19" end="22" vendor="Arm" comment="Contact [email protected]"/>
+    <ids type="MemoryOperand" start="23" end="30" comment="Unreserved bits reservable for use by vendors"/>
     <ids type="MemoryOperand" start="31" end="31" vendor="Khronos" comment="Reserved MemoryOperand bit, not available to vendors"/>
 
     <!-- SECTION: SPIR-V Image Operand Bit Reservations -->

diff --git a/include/spirv/unified1/NonSemanticVkspReflection.h b/include/spirv/unified1/NonSemanticVkspReflection.h
@@ -33,7 +33,7 @@ extern "C" {
 #endif
 
 enum {
-    NonSemanticVkspReflectionRevision = 2,
+    NonSemanticVkspReflectionRevision = 3,
     NonSemanticVkspReflectionRevision_BitWidthPadding = 0x7fffffff
 };
 

diff --git a/include/spirv/unified1/extinst.nonsemantic.vkspreflection.grammar.json b/include/spirv/unified1/extinst.nonsemantic.vkspreflection.grammar.json
@@ -1,5 +1,5 @@
 {
-  "revision" : 2,
+  "revision" : 3,
   "instructions" : [
     {
       "opname" : "Configuration",
@@ -65,7 +65,9 @@
         { "kind" : "LiteralInteger", "name" : "offset" },
         { "kind" : "LiteralInteger", "name" : "memorySize" },
         { "kind" : "LiteralInteger", "name" : "memoryType" },
-        { "kind" : "LiteralInteger", "name" : "bindOffset" }
+        { "kind" : "LiteralInteger", "name" : "bindOffset" },
+        { "kind" : "LiteralInteger", "name" : "viewFlags" },
+        { "kind" : "LiteralInteger", "name" : "viewFormat" }
       ]
     },
     {