diff options
author | Raun Krisch <raun.krisch@gmail.com> | 2021-06-09 09:32:12 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-09 09:32:12 -0700 |
commit | 857642c6b3dd3c14d9b1646ff46a439be7716aa5 (patch) | |
tree | e0c06f13d9155e71de0db1196f144a2ab346975a | |
parent | 7bfb1b532960c92b4d542c10d4e623c0766b787a (diff) | |
parent | 67da8a913f2334284f6ebcc9cc0b16ea81363818 (diff) | |
download | SPIRV-Headers-857642c6b3dd3c14d9b1646ff46a439be7716aa5.tar.gz |
Merge pull request #217 from StuartDBrady/add-C++-for-OpenCL-lang
Add CPP_for_OpenCL to grammar
-rw-r--r-- | include/spirv/unified1/spirv.core.grammar.json | 4 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.cs | 1 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.h | 1 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.hpp | 1 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.hpp11 | 1 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.json | 3 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.lua | 1 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.py | 1 | ||||
-rw-r--r-- | include/spirv/unified1/spv.d | 1 |
9 files changed, 13 insertions, 1 deletions
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json index 86d2b9d..ef6fc5e 100644 --- a/include/spirv/unified1/spirv.core.grammar.json +++ b/include/spirv/unified1/spirv.core.grammar.json @@ -8927,6 +8927,10 @@ { "enumerant" : "HLSL", "value" : 5 + }, + { + "enumerant" : "CPP_for_OpenCL", + "value" : 6 } ] }, diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs index 469ad95..ae756a3 100644 --- a/include/spirv/unified1/spirv.cs +++ b/include/spirv/unified1/spirv.cs @@ -61,6 +61,7 @@ namespace Spv OpenCL_C = 3, OpenCL_CPP = 4, HLSL = 5, + CPP_for_OpenCL = 6, } public enum ExecutionModel diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h index dec3b8c..844d791 100644 --- a/include/spirv/unified1/spirv.h +++ b/include/spirv/unified1/spirv.h @@ -69,6 +69,7 @@ typedef enum SpvSourceLanguage_ { SpvSourceLanguageOpenCL_C = 3, SpvSourceLanguageOpenCL_CPP = 4, SpvSourceLanguageHLSL = 5, + SpvSourceLanguageCPP_for_OpenCL = 6, SpvSourceLanguageMax = 0x7fffffff, } SpvSourceLanguage; diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp index 737581d..0e066f1 100644 --- a/include/spirv/unified1/spirv.hpp +++ b/include/spirv/unified1/spirv.hpp @@ -65,6 +65,7 @@ enum SourceLanguage { SourceLanguageOpenCL_C = 3, SourceLanguageOpenCL_CPP = 4, SourceLanguageHLSL = 5, + SourceLanguageCPP_for_OpenCL = 6, SourceLanguageMax = 0x7fffffff, }; diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11 index b2a0d60..27527bc 100644 --- a/include/spirv/unified1/spirv.hpp11 +++ b/include/spirv/unified1/spirv.hpp11 @@ -65,6 +65,7 @@ enum class SourceLanguage : unsigned { OpenCL_C = 3, OpenCL_CPP = 4, HLSL = 5, + CPP_for_OpenCL = 6, Max = 0x7fffffff, }; diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json index ace7806..b3c677d 100644 --- a/include/spirv/unified1/spirv.json +++ b/include/spirv/unified1/spirv.json @@ -71,7 +71,8 @@ "GLSL": 2, "OpenCL_C": 3, "OpenCL_CPP": 4, - "HLSL": 5 + "HLSL": 5, + "CPP_for_OpenCL": 6 } }, { diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua index 26f1b69..4773883 100644 --- a/include/spirv/unified1/spirv.lua +++ b/include/spirv/unified1/spirv.lua @@ -56,6 +56,7 @@ spv = { OpenCL_C = 3, OpenCL_CPP = 4, HLSL = 5, + CPP_for_OpenCL = 6, }, ExecutionModel = { diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py index ccfc786..459e408 100644 --- a/include/spirv/unified1/spirv.py +++ b/include/spirv/unified1/spirv.py @@ -56,6 +56,7 @@ spv = { 'OpenCL_C' : 3, 'OpenCL_CPP' : 4, 'HLSL' : 5, + 'CPP_for_OpenCL' : 6, }, 'ExecutionModel' : { diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d index 513eca1..81ff8a2 100644 --- a/include/spirv/unified1/spv.d +++ b/include/spirv/unified1/spv.d @@ -64,6 +64,7 @@ enum SourceLanguage : uint OpenCL_C = 3, OpenCL_CPP = 4, HLSL = 5, + CPP_for_OpenCL = 6, } enum ExecutionModel : uint |