projects
/
platform
/
upstream
/
SPIRV-Headers.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f836486
)
Add CPP_for_OpenCL to grammar
author
Stuart Brady
<stuart.brady@arm.com>
Mon, 7 Jun 2021 12:25:56 +0000
(13:25 +0100)
committer
Stuart Brady
<stuart.brady@arm.com>
Wed, 9 Jun 2021 15:03:50 +0000
(16:03 +0100)
include/spirv/unified1/spirv.core.grammar.json
patch
|
blob
|
history
include/spirv/unified1/spirv.cs
patch
|
blob
|
history
include/spirv/unified1/spirv.h
patch
|
blob
|
history
include/spirv/unified1/spirv.hpp
patch
|
blob
|
history
include/spirv/unified1/spirv.hpp11
patch
|
blob
|
history
include/spirv/unified1/spirv.json
patch
|
blob
|
history
include/spirv/unified1/spirv.lua
patch
|
blob
|
history
include/spirv/unified1/spirv.py
patch
|
blob
|
history
include/spirv/unified1/spv.d
patch
|
blob
|
history
diff --git
a/include/spirv/unified1/spirv.core.grammar.json
b/include/spirv/unified1/spirv.core.grammar.json
index
3d471d5
..
ad98d1d
100644
(file)
--- a/
include/spirv/unified1/spirv.core.grammar.json
+++ b/
include/spirv/unified1/spirv.core.grammar.json
@@
-8007,6
+8007,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
a90996c
..
ba63f1b
100644
(file)
--- 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
1bab0aa
..
9b232da
100644
(file)
--- 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
5df8e47
..
7b9ac21
100644
(file)
--- 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
539ddd6
..
6b7cec3
100644
(file)
--- 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
a03be06
..
e4320e8
100644
(file)
--- 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
ed0549b
..
fda428f
100644
(file)
--- 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
90e71c4
..
0d46164
100644
(file)
--- 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
95c61c0
..
7c272c9
100644
(file)
--- 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