Merge pull request #357 from SirLynix/patch-1
Add NZSL and NZSLc as source language/generators
diff --git a/include/spirv/spir-v.xml b/include/spirv/spir-v.xml
index b6cad39..989b996 100644
--- a/include/spirv/spir-v.xml
+++ b/include/spirv/spir-v.xml
@@ -89,7 +89,8 @@
<id value="36" vendor="Taichi Graphics" tool="Taichi" comment="Contact Rendong Liang rendongliang@taichi.graphics, Repo https://github.com/taichi-dev/taichi"/>
<id value="37" vendor="heroseh" tool="Hero C Compiler" comment="https://github.com/heroseh/hcc"/>
<id value="38" vendor="Meta" tool="SparkSL" comment="Contact Dunfan Lu, dunfanlu@meta.com, https://sparkar.facebook.com/ar-studio/learn/sparksl/sparksl-overview"/>
- <unused start="39" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
+ <id value="39" vendor="SirLynix" tool="Nazara ShaderLang Compiler" comment="Contact Jérôme Leclercq, https://github.com/NazaraEngine/ShaderLang"/>
+ <unused start="40" end="0xFFFF" comment="Tool ID range reservable for future use by vendors"/>
</ids>
<!-- SECTION: SPIR-V Opcodes and Enumerants -->
diff --git a/include/spirv/unified1/spirv.bf b/include/spirv/unified1/spirv.bf
index 495d185..d1e90cb 100644
--- a/include/spirv/unified1/spirv.bf
+++ b/include/spirv/unified1/spirv.bf
@@ -67,6 +67,7 @@
CPP_for_OpenCL = 6,
SYCL = 7,
HERO_C = 8,
+ NZSL = 9,
}
[AllowDuplicates, CRepr] public enum ExecutionModel
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json
index 3ca1276..f33d169 100644
--- a/include/spirv/unified1/spirv.core.grammar.json
+++ b/include/spirv/unified1/spirv.core.grammar.json
@@ -10159,6 +10159,10 @@
{
"enumerant" : "HERO_C",
"value" : 8
+ },
+ {
+ "enumerant" : "NZSL",
+ "value" : 9
}
]
},
diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs
index 1e6f0fc..aca7744 100644
--- a/include/spirv/unified1/spirv.cs
+++ b/include/spirv/unified1/spirv.cs
@@ -66,6 +66,7 @@
CPP_for_OpenCL = 6,
SYCL = 7,
HERO_C = 8,
+ NZSL = 9,
}
public enum ExecutionModel
diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h
index 50eb986..861399f 100644
--- a/include/spirv/unified1/spirv.h
+++ b/include/spirv/unified1/spirv.h
@@ -74,6 +74,7 @@
SpvSourceLanguageCPP_for_OpenCL = 6,
SpvSourceLanguageSYCL = 7,
SpvSourceLanguageHERO_C = 8,
+ SpvSourceLanguageNZSL = 9,
SpvSourceLanguageMax = 0x7fffffff,
} SpvSourceLanguage;
diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp
index 072373a..b1330ab 100644
--- a/include/spirv/unified1/spirv.hpp
+++ b/include/spirv/unified1/spirv.hpp
@@ -70,6 +70,7 @@
SourceLanguageCPP_for_OpenCL = 6,
SourceLanguageSYCL = 7,
SourceLanguageHERO_C = 8,
+ SourceLanguageNZSL = 9,
SourceLanguageMax = 0x7fffffff,
};
diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11
index 9788e8b..2b5aa5c 100644
--- a/include/spirv/unified1/spirv.hpp11
+++ b/include/spirv/unified1/spirv.hpp11
@@ -70,6 +70,7 @@
CPP_for_OpenCL = 6,
SYCL = 7,
HERO_C = 8,
+ NZSL = 9,
Max = 0x7fffffff,
};
diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json
index b449ef0..df8c8b9 100644
--- a/include/spirv/unified1/spirv.json
+++ b/include/spirv/unified1/spirv.json
@@ -76,7 +76,8 @@
"HLSL": 5,
"CPP_for_OpenCL": 6,
"SYCL": 7,
- "HERO_C": 8
+ "HERO_C": 8,
+ "NZSL": 9
}
},
{
diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua
index 858fc5d..3c07ddb 100644
--- a/include/spirv/unified1/spirv.lua
+++ b/include/spirv/unified1/spirv.lua
@@ -61,6 +61,7 @@
CPP_for_OpenCL = 6,
SYCL = 7,
HERO_C = 8,
+ NZSL = 9,
},
ExecutionModel = {
diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py
index e4550d1..bc73928 100644
--- a/include/spirv/unified1/spirv.py
+++ b/include/spirv/unified1/spirv.py
@@ -61,6 +61,7 @@
'CPP_for_OpenCL' : 6,
'SYCL' : 7,
'HERO_C' : 8,
+ 'NZSL' : 9,
},
'ExecutionModel' : {
diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d
index fac4d46..591ab17 100644
--- a/include/spirv/unified1/spv.d
+++ b/include/spirv/unified1/spv.d
@@ -69,6 +69,7 @@
CPP_for_OpenCL = 6,
SYCL = 7,
HERO_C = 8,
+ NZSL = 9,
}
enum ExecutionModel : uint
