Skip to content

Commit

Permalink
Merge branch 'main' of github.com:KhronosGroup/SPIRV-Headers into hea…
Browse files Browse the repository at this point in the history 
…der_4_hlsl
  • Loading branch information
devsh committed Nov 5, 2024
2 parents 719dc53 + cb6b2c3 commit 2c85dc0
Show file tree
Hide file tree
Showing 16 changed files with 3,419 additions and 2,541 deletions.
14 changes: 9 additions & 5 deletions include/spirv/spir-v.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@
<id value="11" vendor="Intel" comment="Contact Alexey, [email protected]"/>
<id value="12" vendor="Imagination" comment="Contact Stephen Clarke, [email protected]"/>
<id value="13" vendor="Google" tool="Shaderc over Glslang" comment="Contact David Neto, [email protected]"/>
<id value="14" vendor="Google" tool="spiregg" comment="Contact Lei Zhang, antiagainst@google.com"/>
<id value="14" vendor="Google" tool="spiregg" comment="Contact Steven Perron, stevenperron@google.com"/>
<id value="15" vendor="Google" tool="rspirv" comment="Contact Lei Zhang, [email protected]"/>
<id value="16" vendor="X-LEGEND" tool="Mesa-IR/SPIR-V Translator" comment="Contact Metora Wang, github:metora/MesaGLSLCompiler"/>
<id value="17" vendor="Khronos" tool="SPIR-V Tools Linker" comment="Contact David Neto, [email protected]"/>
<id value="18" vendor="Wine" tool="VKD3D Shader Compiler" comment="Contact [email protected]"/>
<id value="19" vendor="Tellusim" tool="Clay Shader Compiler" comment="Contact [email protected]"/>
<id value="20" vendor="W3C WebGPU Group" tool="WHLSL Shader Translator" comment="https://github.com/gpuweb/WHLSL"/>
<id value="21" vendor="Google" tool="Clspv" comment="Contact David Neto, [email protected]"/>
<id value="22" vendor="Google" tool="MLIR SPIR-V Serializer" comment="Contact Lei Zhang, antiagainst@google.com"/>
<id value="22" vendor="LLVM" tool="MLIR SPIR-V Serializer" comment="Contact Jakub Kuderski, jakub.kuderski@amd.com, https://mlir.llvm.org/docs/Dialects/SPIR-V/"/>
<id value="23" vendor="Google" tool="Tint Compiler" comment="Contact David Neto, [email protected]"/>
<id value="24" vendor="Google" tool="ANGLE Shader Compiler" comment="Contact Shahbaz Youssefi, [email protected]"/>
<id value="25" vendor="Netease Games" tool="Messiah Shader Compiler" comment="Contact Yuwen Wu, [email protected]"/>
Expand All @@ -94,7 +94,9 @@
<id value="41" vendor="Zig Software Foundation" tool="Zig Compiler" comment="Contact Robin Voetter, https://github.com/Snektron"/>
<id value="42" vendor="Rendong Liang" tool="spq" comment="Contact Rendong Liang, [email protected], https://github.com/PENGUINLIONG/spq-rs"/>
<id value="43" vendor="LLVM" tool="LLVM SPIR-V Backend" comment="Contact Michal Paszkowski, [email protected], https://github.com/llvm/llvm-project/tree/main/llvm/lib/Target/SPIRV"/>
<unused start="44" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
<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, [email protected], https://github.com/Inochi2D/nuvk"/>
<unused start="46" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
</ids>

<!-- SECTION: SPIR-V Opcodes and Enumerants -->
Expand Down Expand Up @@ -151,13 +153,14 @@
<ids type="opcode" start="6528" end="6591" vendor="Codeplay" comment="Contact [email protected]"/>
<ids type="opcode" start="6592" end="6655" vendor="Saarland University" comment="Contact [email protected]"/>
<ids type="opcode" start="6656" end="6719" vendor="Meta" comment="Contact [email protected]"/>
<ids type="opcode" start="6720" end="6783" vendor="MediaTek" comment="Contact [email protected]"/>
<!-- Opcode enumerants to reserve 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
sure to fill in the vendor attribute, and preferably add a contact
person/address in a comment attribute. -->
<!-- Example new block: <ids type="opcode" start="XXXX" end="XXXX+64n-1" vendor="Add vendor" comment="Contact TBD"/> -->
<ids type="opcode" start="6720" end="65535" comment="Opcode range reservable for future use by vendors"/>
<ids type="opcode" start="6784" end="65535" comment="Opcode range reservable for future use by vendors"/>
<!-- End reservations of opcodes -->


Expand All @@ -184,13 +187,14 @@
<ids type="enumerant" start="6528" end="6591" vendor="Codeplay" comment="Contact [email protected]"/>
<ids type="enumerant" start="6592" end="6655" vendor="Saarland University" comment="Contact [email protected]"/>
<ids type="enumerant" start="6656" end="6719" vendor="Meta" comment="Contact [email protected]"/>
<ids type="enumerant" start="6720" end="6783" vendor="MediaTek" comment="Contact [email protected]"/>
<!-- Enumerants to reserve 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
sure to fill in the vendor attribute, and preferably add a contact
person/address in a comment attribute. -->
<!-- Example new block: <ids type="enumerant" start="XXXX" end="XXXX+64n-1" vendor="Add vendor" comment="Contact TBD"/> -->
<ids type="enumerant" start="6720" end="4294967295" comment="Enumerant range reservable for future use by vendors"/>
<ids type="enumerant" start="6784" end="4294967295" comment="Enumerant range reservable for future use by vendors"/>
<!-- End reservations of enumerants -->


Expand Down
2 changes: 1 addition & 1 deletion include/spirv/unified1/NonSemanticVkspReflection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ extern "C" {
#endif

enum {
NonSemanticVkspReflectionRevision = 3,
NonSemanticVkspReflectionRevision = 4,
NonSemanticVkspReflectionRevision_BitWidthPadding = 0x7fffffff
};

Expand Down
170 changes: 85 additions & 85 deletions include/spirv/unified1/extinst.nonsemantic.vkspreflection.grammar.json
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"revision" : 3,
"revision" : 4,
"instructions" : [
{
"opname" : "Configuration",
"opcode" : 1,
"operands" : [
{"kind" : "LiteralString", "name" : "enabledExtensionNames" },
{"kind" : "LiteralInteger", "name" : "specializationInfoDataSize" },
{"kind" : "LiteralString", "name" : "specializationInfoData" },
{"kind" : "LiteralString", "name" : "shaderName" },
{"kind" : "LiteralString", "name" : "EntryPoint" },
{"kind" : "LiteralInteger", "name" : "groupCountX" },
{"kind" : "LiteralInteger", "name" : "groupCountY" },
{"kind" : "LiteralInteger", "name" : "groupCountZ" },
{"kind" : "LiteralInteger", "name" : "dispatchId" }
{"kind" : "IdRef", "name" : "enabledExtensionNames" },
{"kind" : "IdRef", "name" : "specializationInfoDataSize" },
{"kind" : "IdRef", "name" : "specializationInfoData" },
{"kind" : "IdRef", "name" : "shaderName" },
{"kind" : "IdRef", "name" : "EntryPoint" },
{"kind" : "IdRef", "name" : "groupCountX" },
{"kind" : "IdRef", "name" : "groupCountY" },
{"kind" : "IdRef", "name" : "groupCountZ" },
{"kind" : "IdRef", "name" : "dispatchId" }
]
},
{
"opname" : "StartCounter",
"opcode" : 2,
"operands" : [
{"kind" : "LiteralString", "name" : "name" }
{"kind" : "IdRef", "name" : "name" }
]
},
{
Expand All @@ -34,104 +34,104 @@
"opname" : "PushConstants",
"opcode" : 4,
"operands" : [
{ "kind" : "LiteralInteger", "name" : "offset" },
{ "kind" : "LiteralInteger", "name" : "size" },
{ "kind" : "LiteralString", "name" : "pValues" },
{ "kind" : "LiteralInteger", "name" : "stageFlags" }
{ "kind" : "IdRef", "name" : "offset" },
{ "kind" : "IdRef", "name" : "size" },
{ "kind" : "IdRef", "name" : "pValues" },
{ "kind" : "IdRef", "name" : "stageFlags" }
]
},
{
"opname" : "SpecializationMapEntry",
"opcode" : 5,
"operands" : [
{"kind" : "LiteralInteger", "name" : "constantID" },
{"kind" : "LiteralInteger", "name" : "offset" },
{"kind" : "LiteralInteger", "name" : "size" }
{"kind" : "IdRef", "name" : "constantID" },
{"kind" : "IdRef", "name" : "offset" },
{"kind" : "IdRef", "name" : "size" }
]
},
{
"opname" : "DescriptorSetBuffer",
"opcode" : 6,
"operands" : [
{ "kind" : "LiteralInteger", "name" : "ds" },
{ "kind" : "LiteralInteger", "name" : "binding" },
{ "kind" : "LiteralInteger", "name" : "type" },
{ "kind" : "LiteralInteger", "name" : "flags" },
{ "kind" : "LiteralInteger", "name" : "queueFamilyIndexCount" },
{ "kind" : "LiteralInteger", "name" : "sharingMode" },
{ "kind" : "LiteralInteger", "name" : "size" },
{ "kind" : "LiteralInteger", "name" : "usage" },
{ "kind" : "LiteralInteger", "name" : "range" },
{ "kind" : "LiteralInteger", "name" : "offset" },
{ "kind" : "LiteralInteger", "name" : "memorySize" },
{ "kind" : "LiteralInteger", "name" : "memoryType" },
{ "kind" : "LiteralInteger", "name" : "bindOffset" },
{ "kind" : "LiteralInteger", "name" : "viewFlags" },
{ "kind" : "LiteralInteger", "name" : "viewFormat" }
{ "kind" : "IdRef", "name" : "ds" },
{ "kind" : "IdRef", "name" : "binding" },
{ "kind" : "IdRef", "name" : "type" },
{ "kind" : "IdRef", "name" : "flags" },
{ "kind" : "IdRef", "name" : "queueFamilyIndexCount" },
{ "kind" : "IdRef", "name" : "sharingMode" },
{ "kind" : "IdRef", "name" : "size" },
{ "kind" : "IdRef", "name" : "usage" },
{ "kind" : "IdRef", "name" : "range" },
{ "kind" : "IdRef", "name" : "offset" },
{ "kind" : "IdRef", "name" : "memorySize" },
{ "kind" : "IdRef", "name" : "memoryType" },
{ "kind" : "IdRef", "name" : "bindOffset" },
{ "kind" : "IdRef", "name" : "viewFlags" },
{ "kind" : "IdRef", "name" : "viewFormat" }
]
},
{
"opname" : "DescriptorSetImage",
"opcode" : 7,
"operands" : [
{ "kind" : "LiteralInteger", "name" : "ds" },
{ "kind" : "LiteralInteger", "name" : "binding" },
{ "kind" : "LiteralInteger", "name" : "type" },
{ "kind" : "LiteralInteger", "name" : "imageLayout"},
{ "kind" : "LiteralInteger", "name" : "imageFlags"},
{ "kind" : "LiteralInteger", "name" : "imageType"},
{ "kind" : "LiteralInteger", "name" : "imageformat"},
{ "kind" : "LiteralInteger", "name" : "width"},
{ "kind" : "LiteralInteger", "name" : "height"},
{ "kind" : "LiteralInteger", "name" : "depth"},
{ "kind" : "LiteralInteger", "name" : "mipLevels"},
{ "kind" : "LiteralInteger", "name" : "arrayLayers"},
{ "kind" : "LiteralInteger", "name" : "samples"},
{ "kind" : "LiteralInteger", "name" : "tiling"},
{ "kind" : "LiteralInteger", "name" : "usage"},
{ "kind" : "LiteralInteger", "name" : "sharingMode"},
{ "kind" : "LiteralInteger", "name" : "queueFamilyIndexCount"},
{ "kind" : "LiteralInteger", "name" : "initialLayout"},
{ "kind" : "LiteralInteger", "name" : "aspectMask"},
{ "kind" : "LiteralInteger", "name" : "baseMipLevel"},
{ "kind" : "LiteralInteger", "name" : "levelCount"},
{ "kind" : "LiteralInteger", "name" : "baseArrayLayer"},
{ "kind" : "LiteralInteger", "name" : "layerCount"},
{ "kind" : "LiteralInteger", "name" : "viewFlags"},
{ "kind" : "LiteralInteger", "name" : "viewType"},
{ "kind" : "LiteralInteger", "name" : "viewFormat"},
{ "kind" : "LiteralInteger", "name" : "component_a"},
{ "kind" : "LiteralInteger", "name" : "component_b"},
{ "kind" : "LiteralInteger", "name" : "component_g"},
{ "kind" : "LiteralInteger", "name" : "component_r"},
{ "kind" : "LiteralInteger", "name" : "memorySize" },
{ "kind" : "LiteralInteger", "name" : "memoryType" },
{ "kind" : "LiteralInteger", "name" : "bindOffset"}
{ "kind" : "IdRef", "name" : "ds" },
{ "kind" : "IdRef", "name" : "binding" },
{ "kind" : "IdRef", "name" : "type" },
{ "kind" : "IdRef", "name" : "imageLayout"},
{ "kind" : "IdRef", "name" : "imageFlags"},
{ "kind" : "IdRef", "name" : "imageType"},
{ "kind" : "IdRef", "name" : "imageformat"},
{ "kind" : "IdRef", "name" : "width"},
{ "kind" : "IdRef", "name" : "height"},
{ "kind" : "IdRef", "name" : "depth"},
{ "kind" : "IdRef", "name" : "mipLevels"},
{ "kind" : "IdRef", "name" : "arrayLayers"},
{ "kind" : "IdRef", "name" : "samples"},
{ "kind" : "IdRef", "name" : "tiling"},
{ "kind" : "IdRef", "name" : "usage"},
{ "kind" : "IdRef", "name" : "sharingMode"},
{ "kind" : "IdRef", "name" : "queueFamilyIndexCount"},
{ "kind" : "IdRef", "name" : "initialLayout"},
{ "kind" : "IdRef", "name" : "aspectMask"},
{ "kind" : "IdRef", "name" : "baseMipLevel"},
{ "kind" : "IdRef", "name" : "levelCount"},
{ "kind" : "IdRef", "name" : "baseArrayLayer"},
{ "kind" : "IdRef", "name" : "layerCount"},
{ "kind" : "IdRef", "name" : "viewFlags"},
{ "kind" : "IdRef", "name" : "viewType"},
{ "kind" : "IdRef", "name" : "viewFormat"},
{ "kind" : "IdRef", "name" : "component_a"},
{ "kind" : "IdRef", "name" : "component_b"},
{ "kind" : "IdRef", "name" : "component_g"},
{ "kind" : "IdRef", "name" : "component_r"},
{ "kind" : "IdRef", "name" : "memorySize" },
{ "kind" : "IdRef", "name" : "memoryType" },
{ "kind" : "IdRef", "name" : "bindOffset"}
]
},
{
"opname" : "DescriptorSetSampler",
"opcode" : 8,
"operands" : [
{ "kind" : "LiteralInteger", "name" : "ds" },
{ "kind" : "LiteralInteger", "name" : "binding" },
{ "kind" : "LiteralInteger", "name" : "type" },
{ "kind" : "LiteralInteger", "name" : "flags"},
{ "kind" : "LiteralInteger", "name" : "magFilter"},
{ "kind" : "LiteralInteger", "name" : "minFilter"},
{ "kind" : "LiteralInteger", "name" : "mipmapMode"},
{ "kind" : "LiteralInteger", "name" : "addressModeU"},
{ "kind" : "LiteralInteger", "name" : "addressModeV"},
{ "kind" : "LiteralInteger", "name" : "addressModeW"},
{ "kind" : "LiteralFloat", "name" : "mipLodBias"},
{ "kind" : "LiteralInteger", "name" : "anisotropyEnable"},
{ "kind" : "LiteralFloat", "name" : "maxAnisotropy"},
{ "kind" : "LiteralInteger", "name" : "compareEnable"},
{ "kind" : "LiteralInteger", "name" : "compareOp"},
{ "kind" : "LiteralFloat", "name" : "minLod"},
{ "kind" : "LiteralFloat", "name" : "maxLod"},
{ "kind" : "LiteralInteger", "name" : "borderColor"},
{ "kind" : "LiteralInteger", "name" : "unnormalizedCoordinates"}
{ "kind" : "IdRef", "name" : "ds" },
{ "kind" : "IdRef", "name" : "binding" },
{ "kind" : "IdRef", "name" : "type" },
{ "kind" : "IdRef", "name" : "flags"},
{ "kind" : "IdRef", "name" : "magFilter"},
{ "kind" : "IdRef", "name" : "minFilter"},
{ "kind" : "IdRef", "name" : "mipmapMode"},
{ "kind" : "IdRef", "name" : "addressModeU"},
{ "kind" : "IdRef", "name" : "addressModeV"},
{ "kind" : "IdRef", "name" : "addressModeW"},
{ "kind" : "IdRef", "name" : "mipLodBias"},
{ "kind" : "IdRef", "name" : "anisotropyEnable"},
{ "kind" : "IdRef", "name" : "maxAnisotropy"},
{ "kind" : "IdRef", "name" : "compareEnable"},
{ "kind" : "IdRef", "name" : "compareOp"},
{ "kind" : "IdRef", "name" : "minLod"},
{ "kind" : "IdRef", "name" : "maxLod"},
{ "kind" : "IdRef", "name" : "borderColor"},
{ "kind" : "IdRef", "name" : "unnormalizedCoordinates"}
]
}
]
Expand Down
Loading

0 comments on commit 2c85dc0

Please sign in to comment.