diff options
author | Raun Krisch <raun.krisch@gmail.com> | 2020-11-28 02:52:34 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-28 02:52:34 +0300 |
commit | f027d53ded7e230e008d37c8b47ede7cd308e19d (patch) | |
tree | b4b43290362b9984d3598b2b2b24ab8be8ebb664 | |
parent | 104ecc356c1bea4476320faca64440cd1df655a3 (diff) | |
parent | bdd2aa34c450edb77441c82fdc2f20f1dc9d833d (diff) |
Merge pull request #184 from dgkoch/dkoch_remove_hittkhr1.5.4.raytracing.fixed
remove HitTKHR alias
-rw-r--r-- | include/spirv/unified1/spirv.core.grammar.json | 11 | ||||
-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 | 1 | ||||
-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, 2 insertions, 17 deletions
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json index c91540d..44e7298 100644 --- a/include/spirv/unified1/spirv.core.grammar.json +++ b/include/spirv/unified1/spirv.core.grammar.json @@ -10431,15 +10431,8 @@ { "enumerant" : "HitTNV", "value" : 5332, - "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], - "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], - "version" : "None" - }, - { - "enumerant" : "HitTKHR", - "value" : 5332, - "capabilities" : [ "RayTracingNV" , "RayTracingKHR" ], - "extensions" : [ "SPV_NV_ray_tracing" , "SPV_KHR_ray_tracing" ], + "capabilities" : [ "RayTracingNV" ], + "extensions" : [ "SPV_NV_ray_tracing" ], "version" : "None" }, { diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs index e0ed1e8..dd091b6 100644 --- a/include/spirv/unified1/spirv.cs +++ b/include/spirv/unified1/spirv.cs @@ -612,7 +612,6 @@ namespace Spv ObjectToWorldNV = 5330, WorldToObjectKHR = 5331, WorldToObjectNV = 5331, - HitTKHR = 5332, HitTNV = 5332, HitKindKHR = 5333, HitKindNV = 5333, diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h index fae2a10..949f198 100644 --- a/include/spirv/unified1/spirv.h +++ b/include/spirv/unified1/spirv.h @@ -618,7 +618,6 @@ typedef enum SpvBuiltIn_ { SpvBuiltInObjectToWorldNV = 5330, SpvBuiltInWorldToObjectKHR = 5331, SpvBuiltInWorldToObjectNV = 5331, - SpvBuiltInHitTKHR = 5332, SpvBuiltInHitTNV = 5332, SpvBuiltInHitKindKHR = 5333, SpvBuiltInHitKindNV = 5333, diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp index a5383de..43dd2aa 100644 --- a/include/spirv/unified1/spirv.hpp +++ b/include/spirv/unified1/spirv.hpp @@ -614,7 +614,6 @@ enum BuiltIn { BuiltInObjectToWorldNV = 5330, BuiltInWorldToObjectKHR = 5331, BuiltInWorldToObjectNV = 5331, - BuiltInHitTKHR = 5332, BuiltInHitTNV = 5332, BuiltInHitKindKHR = 5333, BuiltInHitKindNV = 5333, diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11 index aec611f..27a998e 100644 --- a/include/spirv/unified1/spirv.hpp11 +++ b/include/spirv/unified1/spirv.hpp11 @@ -614,7 +614,6 @@ enum class BuiltIn : unsigned { ObjectToWorldNV = 5330, WorldToObjectKHR = 5331, WorldToObjectNV = 5331, - HitTKHR = 5332, HitTNV = 5332, HitKindKHR = 5333, HitKindNV = 5333, diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json index a1fd3b9..98f9fba 100644 --- a/include/spirv/unified1/spirv.json +++ b/include/spirv/unified1/spirv.json @@ -647,7 +647,6 @@ "ObjectToWorldNV": 5330, "WorldToObjectKHR": 5331, "WorldToObjectNV": 5331, - "HitTKHR": 5332, "HitTNV": 5332, "HitKindKHR": 5333, "HitKindNV": 5333, diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua index 89b0fc8..536e279 100644 --- a/include/spirv/unified1/spirv.lua +++ b/include/spirv/unified1/spirv.lua @@ -586,7 +586,6 @@ spv = { ObjectToWorldNV = 5330, WorldToObjectKHR = 5331, WorldToObjectNV = 5331, - HitTKHR = 5332, HitTNV = 5332, HitKindKHR = 5333, HitKindNV = 5333, diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py index a9983c0..7cec3d6 100644 --- a/include/spirv/unified1/spirv.py +++ b/include/spirv/unified1/spirv.py @@ -586,7 +586,6 @@ spv = { 'ObjectToWorldNV' : 5330, 'WorldToObjectKHR' : 5331, 'WorldToObjectNV' : 5331, - 'HitTKHR' : 5332, 'HitTNV' : 5332, 'HitKindKHR' : 5333, 'HitKindNV' : 5333, diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d index b840139..8bb729f 100644 --- a/include/spirv/unified1/spv.d +++ b/include/spirv/unified1/spv.d @@ -615,7 +615,6 @@ enum BuiltIn : uint ObjectToWorldNV = 5330, WorldToObjectKHR = 5331, WorldToObjectNV = 5331, - HitTKHR = 5332, HitTNV = 5332, HitKindKHR = 5333, HitKindNV = 5333, |