Merge pull request KhronosGroup#357 from SirLynix/patch-1

johnkslang · web-flow · commit d0006a3938d7 · 2023-07-05T10:30:08.000-06:00
Add NZSL and NZSLc as source language/generators
diff --git 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
@@ -67,6 +67,7 @@ namespace Spv
             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
@@ -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
@@ -66,6 +66,7 @@ public enum SourceLanguage
             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
@@ -74,6 +74,7 @@ typedef enum SpvSourceLanguage_ {
     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
@@ -70,6 +70,7 @@ enum SourceLanguage {
     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
@@ -70,6 +70,7 @@ enum class SourceLanguage : unsigned {
     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
@@ -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
@@ -61,6 +61,7 @@ spv = {
         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
@@ -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
@@ -69,6 +69,7 @@ enum SourceLanguage : uint
     CPP_for_OpenCL = 6,
     SYCL = 7,
     HERO_C = 8,
+    NZSL = 9,
 }
 
 enum ExecutionModel : uint

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ namespace Spv`
`67`	`67`	`CPP_for_OpenCL = 6,`
`68`	`68`	`SYCL = 7,`
`69`	`69`	`HERO_C = 8,`
	`70`	`+ NZSL = 9,`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`[AllowDuplicates, CRepr] public enum ExecutionModel`
Original file line number	Diff line number	Diff line change
`@@ -10159,6 +10159,10 @@`
`10159`	`10159`	`{`
`10160`	`10160`	`"enumerant" : "HERO_C",`
`10161`	`10161`	`"value" : 8`
	`10162`	`+ },`
	`10163`	`+ {`
	`10164`	`+ "enumerant" : "NZSL",`
	`10165`	`+ "value" : 9`
`10162`	`10166`	`}`
`10163`	`10167`	`]`
`10164`	`10168`	`},`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ public enum SourceLanguage`
`66`	`66`	`CPP_for_OpenCL = 6,`
`67`	`67`	`SYCL = 7,`
`68`	`68`	`HERO_C = 8,`
	`69`	`+ NZSL = 9,`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`public enum ExecutionModel`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@`
`76`	`76`	`"HLSL": 5,`
`77`	`77`	`"CPP_for_OpenCL": 6,`
`78`	`78`	`"SYCL": 7,`
`79`		`- "HERO_C": 8`
	`79`	`+ "HERO_C": 8,`
	`80`	`+ "NZSL": 9`
`80`	`81`	`}`
`81`	`82`	`},`
`82`	`83`	`{`