summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Kessenich <johnkslang@users.noreply.github.com>2018-02-15 10:10:42 -0700
committerGitHub <noreply@github.com>2018-02-15 10:10:42 -0700
commit2bf91d32b2ce17df9ca6c1e62cf478b24e7d2644 (patch)
tree146143ea2f1a2487ac4778ef36c2c8e2818add1d
parentce309203d7eceaf908bea8862c27f3e0749f7d00 (diff)
parent3269e64ab3891cec5a3cb22755cb70bea82b260d (diff)
downloadSPIRV-Headers-2bf91d32b2ce17df9ca6c1e62cf478b24e7d2644.tar.gz
SPIRV-Headers-2bf91d32b2ce17df9ca6c1e62cf478b24e7d2644.tar.bz2
SPIRV-Headers-2bf91d32b2ce17df9ca6c1e62cf478b24e7d2644.zip
Merge pull request #57 from antiagainst/shader_ballot
Allow SubgroupSize and SubgroupLocalInvocationId with SubgroupBallotKHR
-rw-r--r--include/spirv/1.0/spirv.core.grammar.json4
-rw-r--r--include/spirv/1.1/spirv.core.grammar.json4
-rw-r--r--include/spirv/1.2/spirv.core.grammar.json4
-rw-r--r--include/spirv/unified1/spirv.core.grammar.json4
4 files changed, 8 insertions, 8 deletions
diff --git a/include/spirv/1.0/spirv.core.grammar.json b/include/spirv/1.0/spirv.core.grammar.json
index f05be1c..a5da37a 100644
--- a/include/spirv/1.0/spirv.core.grammar.json
+++ b/include/spirv/1.0/spirv.core.grammar.json
@@ -5005,7 +5005,7 @@
{
"enumerant" : "SubgroupSize",
"value" : 36,
- "capabilities" : [ "Kernel" ]
+ "capabilities" : [ "Kernel", "SubgroupBallotKHR" ]
},
{
"enumerant" : "SubgroupMaxSize",
@@ -5030,7 +5030,7 @@
{
"enumerant" : "SubgroupLocalInvocationId",
"value" : 41,
- "capabilities" : [ "Kernel" ]
+ "capabilities" : [ "Kernel", "SubgroupBallotKHR" ]
},
{
"enumerant" : "VertexIndex",
diff --git a/include/spirv/1.1/spirv.core.grammar.json b/include/spirv/1.1/spirv.core.grammar.json
index c5222e7..71b9759 100644
--- a/include/spirv/1.1/spirv.core.grammar.json
+++ b/include/spirv/1.1/spirv.core.grammar.json
@@ -5153,7 +5153,7 @@
{
"enumerant" : "SubgroupSize",
"value" : 36,
- "capabilities" : [ "Kernel" ]
+ "capabilities" : [ "Kernel", "SubgroupBallotKHR" ]
},
{
"enumerant" : "SubgroupMaxSize",
@@ -5178,7 +5178,7 @@
{
"enumerant" : "SubgroupLocalInvocationId",
"value" : 41,
- "capabilities" : [ "Kernel" ]
+ "capabilities" : [ "Kernel", "SubgroupBallotKHR" ]
},
{
"enumerant" : "VertexIndex",
diff --git a/include/spirv/1.2/spirv.core.grammar.json b/include/spirv/1.2/spirv.core.grammar.json
index 9a9b903..67903d5 100644
--- a/include/spirv/1.2/spirv.core.grammar.json
+++ b/include/spirv/1.2/spirv.core.grammar.json
@@ -5210,7 +5210,7 @@
{
"enumerant" : "SubgroupSize",
"value" : 36,
- "capabilities" : [ "Kernel" ]
+ "capabilities" : [ "Kernel", "SubgroupBallotKHR" ]
},
{
"enumerant" : "SubgroupMaxSize",
@@ -5235,7 +5235,7 @@
{
"enumerant" : "SubgroupLocalInvocationId",
"value" : 41,
- "capabilities" : [ "Kernel" ]
+ "capabilities" : [ "Kernel", "SubgroupBallotKHR" ]
},
{
"enumerant" : "VertexIndex",
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
index fcaa81d..eac20d9 100644
--- a/include/spirv/unified1/spirv.core.grammar.json
+++ b/include/spirv/unified1/spirv.core.grammar.json
@@ -5229,7 +5229,7 @@
{
"enumerant" : "SubgroupSize",
"value" : 36,
- "capabilities" : [ "Kernel" ]
+ "capabilities" : [ "Kernel", "SubgroupBallotKHR" ]
},
{
"enumerant" : "SubgroupMaxSize",
@@ -5254,7 +5254,7 @@
{
"enumerant" : "SubgroupLocalInvocationId",
"value" : 41,
- "capabilities" : [ "Kernel" ]
+ "capabilities" : [ "Kernel", "SubgroupBallotKHR" ]
},
{
"enumerant" : "VertexIndex",