aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLei Zhang <antiagainst@google.com>2018-03-01 16:24:21 -0500
committerLei Zhang <antiagainst@google.com>2018-03-02 11:44:51 -0500
commitfa2319eeae71a44277bca4af1c8d1ab186bdbe3a (patch)
tree5cd71c239a3513d95c9389039d3f6f2d5234a0b6 /include
parent2bf91d32b2ce17df9ca6c1e62cf478b24e7d2644 (diff)
downloadSPIRV-Headers-fa2319eeae71a44277bca4af1c8d1ab186bdbe3a.tar.gz
Add grammar and symbols for two Google extensions to unified1
* SPV_GOOGLE_decorate_string * SPV_GOOGLE_hlsl_functionality1
Diffstat (limited to 'include')
-rw-r--r--include/spirv/unified1/spirv.core.grammar.json43
-rw-r--r--include/spirv/unified1/spirv.h4
-rw-r--r--include/spirv/unified1/spirv.hpp4
-rw-r--r--include/spirv/unified1/spirv.hpp114
-rw-r--r--include/spirv/unified1/spirv.json8
-rw-r--r--include/spirv/unified1/spirv.lua4
-rwxr-xr-xinclude/spirv/unified1/spirv.py4
7 files changed, 69 insertions, 2 deletions
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
index eac20d9..4a91d76 100644
--- a/include/spirv/unified1/spirv.core.grammar.json
+++ b/include/spirv/unified1/spirv.core.grammar.json
@@ -3430,6 +3430,31 @@
],
"capabilities" : [ "SubgroupImageBlockIOINTEL" ],
"version" : "None"
+ },
+ {
+ "opname" : "OpDecorateStringGOOGLE",
+ "opcode" : 5632,
+ "operands" : [
+ { "kind" : "IdRef", "name" : "'Target'" },
+ { "kind" : "Decoration" },
+ { "kind" : "LiteralString" },
+ { "kind" : "LiteralString", "quantifier" : "*" }
+ ],
+ "extensions" : [ "SPV_GOOGLE_decorate_string" ],
+ "version" : "None"
+ },
+ {
+ "opname" : "OpMemberDecorateStringGOOGLE",
+ "opcode" : 5633,
+ "operands" : [
+ { "kind" : "IdRef", "name" : "'Struct Type'" },
+ { "kind" : "LiteralInteger", "name" : "'Member'" },
+ { "kind" : "Decoration" },
+ { "kind" : "LiteralString" },
+ { "kind" : "LiteralString", "quantifier" : "*" }
+ ],
+ "extensions" : [ "SPV_GOOGLE_decorate_string" ],
+ "version" : "None"
}
],
"operand_kinds" : [
@@ -5060,6 +5085,24 @@
"parameters" : [
{ "kind" : "LiteralInteger", "name" : "'Offset'" }
]
+ },
+ {
+ "enumerant" : "HlslCounterBufferGOOGLE",
+ "value" : 5634,
+ "parameters" : [
+ { "kind" : "IdRef", "name" : "'Counter Buffer'" }
+ ],
+ "extensions" : [ "SPV_GOOGLE_hlsl_functionality1" ],
+ "version" : "None"
+ },
+ {
+ "enumerant" : "HlslSemanticGOOGLE",
+ "value" : 5635,
+ "parameters" : [
+ { "kind" : "LiteralString", "name" : "'Semantic'" }
+ ],
+ "extensions" : [ "SPV_GOOGLE_hlsl_functionality1" ],
+ "version" : "None"
}
]
},
diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h
index 233dc6d..3eb6c05 100644
--- a/include/spirv/unified1/spirv.h
+++ b/include/spirv/unified1/spirv.h
@@ -397,6 +397,8 @@ typedef enum SpvDecoration_ {
SpvDecorationPassthroughNV = 5250,
SpvDecorationViewportRelativeNV = 5252,
SpvDecorationSecondaryViewportRelativeNV = 5256,
+ SpvDecorationHlslCounterBufferGOOGLE = 5634,
+ SpvDecorationHlslSemanticGOOGLE = 5635,
SpvDecorationMax = 0x7fffffff,
} SpvDecoration;
@@ -1012,6 +1014,8 @@ typedef enum SpvOp_ {
SpvOpSubgroupBlockWriteINTEL = 5576,
SpvOpSubgroupImageBlockReadINTEL = 5577,
SpvOpSubgroupImageBlockWriteINTEL = 5578,
+ SpvOpDecorateStringGOOGLE = 5632,
+ SpvOpMemberDecorateStringGOOGLE = 5633,
SpvOpMax = 0x7fffffff,
} SpvOp;
diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp
index c677663..884cf29 100644
--- a/include/spirv/unified1/spirv.hpp
+++ b/include/spirv/unified1/spirv.hpp
@@ -393,6 +393,8 @@ enum Decoration {
DecorationPassthroughNV = 5250,
DecorationViewportRelativeNV = 5252,
DecorationSecondaryViewportRelativeNV = 5256,
+ DecorationHlslCounterBufferGOOGLE = 5634,
+ DecorationHlslSemanticGOOGLE = 5635,
DecorationMax = 0x7fffffff,
};
@@ -1008,6 +1010,8 @@ enum Op {
OpSubgroupBlockWriteINTEL = 5576,
OpSubgroupImageBlockReadINTEL = 5577,
OpSubgroupImageBlockWriteINTEL = 5578,
+ OpDecorateStringGOOGLE = 5632,
+ OpMemberDecorateStringGOOGLE = 5633,
OpMax = 0x7fffffff,
};
diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11
index db15038..d86832e 100644
--- a/include/spirv/unified1/spirv.hpp11
+++ b/include/spirv/unified1/spirv.hpp11
@@ -393,6 +393,8 @@ enum class Decoration : unsigned {
PassthroughNV = 5250,
ViewportRelativeNV = 5252,
SecondaryViewportRelativeNV = 5256,
+ HlslCounterBufferGOOGLE = 5634,
+ HlslSemanticGOOGLE = 5635,
Max = 0x7fffffff,
};
@@ -1008,6 +1010,8 @@ enum class Op : unsigned {
OpSubgroupBlockWriteINTEL = 5576,
OpSubgroupImageBlockReadINTEL = 5577,
OpSubgroupImageBlockWriteINTEL = 5578,
+ OpDecorateStringGOOGLE = 5632,
+ OpMemberDecorateStringGOOGLE = 5633,
Max = 0x7fffffff,
};
diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json
index d326c6f..062a8d7 100644
--- a/include/spirv/unified1/spirv.json
+++ b/include/spirv/unified1/spirv.json
@@ -432,7 +432,9 @@
"OverrideCoverageNV": 5248,
"PassthroughNV": 5250,
"ViewportRelativeNV": 5252,
- "SecondaryViewportRelativeNV": 5256
+ "SecondaryViewportRelativeNV": 5256,
+ "HlslCounterBufferGOOGLE": 5634,
+ "HlslSemanticGOOGLE": 5635
}
},
{
@@ -1035,7 +1037,9 @@
"OpSubgroupBlockReadINTEL": 5575,
"OpSubgroupBlockWriteINTEL": 5576,
"OpSubgroupImageBlockReadINTEL": 5577,
- "OpSubgroupImageBlockWriteINTEL": 5578
+ "OpSubgroupImageBlockWriteINTEL": 5578,
+ "OpDecorateStringGOOGLE": 5632,
+ "OpMemberDecorateStringGOOGLE": 5633
}
}
]
diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua
index ecd1fc8..7ba4a65 100644
--- a/include/spirv/unified1/spirv.lua
+++ b/include/spirv/unified1/spirv.lua
@@ -366,6 +366,8 @@ spv = {
PassthroughNV = 5250,
ViewportRelativeNV = 5252,
SecondaryViewportRelativeNV = 5256,
+ HlslCounterBufferGOOGLE = 5634,
+ HlslSemanticGOOGLE = 5635,
},
BuiltIn = {
@@ -969,6 +971,8 @@ spv = {
OpSubgroupBlockWriteINTEL = 5576,
OpSubgroupImageBlockReadINTEL = 5577,
OpSubgroupImageBlockWriteINTEL = 5578,
+ OpDecorateStringGOOGLE = 5632,
+ OpMemberDecorateStringGOOGLE = 5633,
},
}
diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py
index 08c2077..60a1bc4 100755
--- a/include/spirv/unified1/spirv.py
+++ b/include/spirv/unified1/spirv.py
@@ -366,6 +366,8 @@ spv = {
'PassthroughNV' : 5250,
'ViewportRelativeNV' : 5252,
'SecondaryViewportRelativeNV' : 5256,
+ 'HlslCounterBufferGOOGLE' : 5634,
+ 'HlslSemanticGOOGLE' : 5635,
},
'BuiltIn' : {
@@ -969,6 +971,8 @@ spv = {
'OpSubgroupBlockWriteINTEL' : 5576,
'OpSubgroupImageBlockReadINTEL' : 5577,
'OpSubgroupImageBlockWriteINTEL' : 5578,
+ 'OpDecorateStringGOOGLE' : 5632,
+ 'OpMemberDecorateStringGOOGLE' : 5633,
},
}