Skip to content

Commit 719dc53

Browse files
committed
Merge branch 'main' of github.com:KhronosGroup/SPIRV-Headers into header_4_hlsl
2 parents dbf584b + f013f08 commit 719dc53

16 files changed

+548
-27
lines changed

include/spirv/spir-v.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,8 @@
272272
<!-- Reserved memory operand bits -->
273273
<ids type="MemoryOperand" start="0" end="15" vendor="Khronos" comment="Reserved MemoryOperand bits, not available to vendors - see the SPIR-V Specification"/>
274274
<ids type="MemoryOperand" start="16" end="18" vendor="Intel" comment="Contact [email protected]"/>
275-
<ids type="MemoryOperand" start="19" end="30" comment="Unreserved bits reservable for use by vendors"/>
275+
<ids type="MemoryOperand" start="19" end="22" vendor="Arm" comment="Contact [email protected]"/>
276+
<ids type="MemoryOperand" start="23" end="30" comment="Unreserved bits reservable for use by vendors"/>
276277
<ids type="MemoryOperand" start="31" end="31" vendor="Khronos" comment="Reserved MemoryOperand bit, not available to vendors"/>
277278

278279
<!-- SECTION: SPIR-V Image Operand Bit Reservations -->

include/spirv/unified1/NonSemanticVkspReflection.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extern "C" {
3333
#endif
3434

3535
enum {
36-
NonSemanticVkspReflectionRevision = 2,
36+
NonSemanticVkspReflectionRevision = 3,
3737
NonSemanticVkspReflectionRevision_BitWidthPadding = 0x7fffffff
3838
};
3939

include/spirv/unified1/extinst.nonsemantic.vkspreflection.grammar.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"revision" : 2,
2+
"revision" : 3,
33
"instructions" : [
44
{
55
"opname" : "Configuration",
@@ -65,7 +65,9 @@
6565
{ "kind" : "LiteralInteger", "name" : "offset" },
6666
{ "kind" : "LiteralInteger", "name" : "memorySize" },
6767
{ "kind" : "LiteralInteger", "name" : "memoryType" },
68-
{ "kind" : "LiteralInteger", "name" : "bindOffset" }
68+
{ "kind" : "LiteralInteger", "name" : "bindOffset" },
69+
{ "kind" : "LiteralInteger", "name" : "viewFlags" },
70+
{ "kind" : "LiteralInteger", "name" : "viewFormat" }
6971
]
7072
},
7173
{

0 commit comments

Comments
 (0)