diff options
author | Daniel Koch <dkoch@nvidia.com> | 2020-03-17 07:39:38 -0400 |
---|---|---|
committer | Daniel Koch <dkoch@nvidia.com> | 2020-03-17 07:41:42 -0400 |
commit | fdbc0d1c436e2e25fd07ab8455172e37bad65a13 (patch) | |
tree | 380ff72245d301de4ae3c3755ff685bb8d9876d9 | |
parent | 9a186c772c75014e5cff241586cd8a98b4b1430e (diff) | |
download | SPIRV-Headers-fdbc0d1c436e2e25fd07ab8455172e37bad65a13.tar.gz |
Add shadercalls scope
and update copyright notices
-rw-r--r-- | include/spirv/unified1/spirv.core.grammar.json | 7 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.cs | 3 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.h | 3 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.hpp | 3 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.hpp11 | 3 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.json | 5 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.lua | 3 | ||||
-rw-r--r-- | include/spirv/unified1/spirv.py | 3 | ||||
-rw-r--r-- | include/spirv/unified1/spv.d | 3 | ||||
-rw-r--r-- | tools/buildHeaders/header.cpp | 4 | ||||
-rw-r--r-- | tools/buildHeaders/jsonToSpirv.cpp | 2 | ||||
-rw-r--r-- | tools/buildHeaders/jsonToSpirv.h | 2 |
12 files changed, 27 insertions, 14 deletions
diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json index 29991ee..824ae4b 100644 --- a/include/spirv/unified1/spirv.core.grammar.json +++ b/include/spirv/unified1/spirv.core.grammar.json @@ -1,6 +1,6 @@ { "copyright" : [ - "Copyright (c) 2014-2016 The Khronos Group Inc.", + "Copyright (c) 2014-2020 The Khronos Group Inc.", "", "Permission is hereby granted, free of charge, to any person obtaining a copy", "of this software and/or associated documentation files (the \"Materials\"),", @@ -10128,6 +10128,11 @@ "value" : 5, "capabilities" : [ "VulkanMemoryModel" ], "version" : "1.5" + }, + { + "enumerant" : "ShaderCallKHR", + "value" : 6, + "capabilities" : [ "RayTracingProvisionalKHR" ] } ] }, diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs index 46c24ef..c5ddff9 100644 --- a/include/spirv/unified1/spirv.cs +++ b/include/spirv/unified1/spirv.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2019 The Khronos Group Inc. +// Copyright (c) 2014-2020 The Khronos Group Inc. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and/or associated documentation files (the "Materials"), @@ -739,6 +739,7 @@ namespace Spv Invocation = 4, QueueFamily = 5, QueueFamilyKHR = 5, + ShaderCallKHR = 6, } public enum GroupOperation diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h index b908303..92b34c3 100644 --- a/include/spirv/unified1/spirv.h +++ b/include/spirv/unified1/spirv.h @@ -1,5 +1,5 @@ /* -** Copyright (c) 2014-2019 The Khronos Group Inc. +** Copyright (c) 2014-2020 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a copy ** of this software and/or associated documentation files (the "Materials"), @@ -740,6 +740,7 @@ typedef enum SpvScope_ { SpvScopeInvocation = 4, SpvScopeQueueFamily = 5, SpvScopeQueueFamilyKHR = 5, + SpvScopeShaderCallKHR = 6, SpvScopeMax = 0x7fffffff, } SpvScope; diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp index a39b17b..9f98683 100644 --- a/include/spirv/unified1/spirv.hpp +++ b/include/spirv/unified1/spirv.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2019 The Khronos Group Inc. +// Copyright (c) 2014-2020 The Khronos Group Inc. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and/or associated documentation files (the "Materials"), @@ -736,6 +736,7 @@ enum Scope { ScopeInvocation = 4, ScopeQueueFamily = 5, ScopeQueueFamilyKHR = 5, + ScopeShaderCallKHR = 6, ScopeMax = 0x7fffffff, }; diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11 index e3680d7..406ba19 100644 --- a/include/spirv/unified1/spirv.hpp11 +++ b/include/spirv/unified1/spirv.hpp11 @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2019 The Khronos Group Inc. +// Copyright (c) 2014-2020 The Khronos Group Inc. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and/or associated documentation files (the "Materials"), @@ -736,6 +736,7 @@ enum class Scope : unsigned { Invocation = 4, QueueFamily = 5, QueueFamilyKHR = 5, + ShaderCallKHR = 6, Max = 0x7fffffff, }; diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json index 1d399bf..d372beb 100644 --- a/include/spirv/unified1/spirv.json +++ b/include/spirv/unified1/spirv.json @@ -6,7 +6,7 @@ "Comment": [ [ - "Copyright (c) 2014-2019 The Khronos Group Inc.", + "Copyright (c) 2014-2020 The Khronos Group Inc.", "", "Permission is hereby granted, free of charge, to any person obtaining a copy", "of this software and/or associated documentation files (the \"Materials\"),", @@ -725,7 +725,8 @@ "Subgroup": 3, "Invocation": 4, "QueueFamily": 5, - "QueueFamilyKHR": 5 + "QueueFamilyKHR": 5, + "ShaderCallKHR": 6 } }, { diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua index ee105eb..3774a95 100644 --- a/include/spirv/unified1/spirv.lua +++ b/include/spirv/unified1/spirv.lua @@ -1,4 +1,4 @@ --- Copyright (c) 2014-2019 The Khronos Group Inc. +-- Copyright (c) 2014-2020 The Khronos Group Inc. -- -- Permission is hereby granted, free of charge, to any person obtaining a copy -- of this software and/or associated documentation files (the "Materials"), @@ -702,6 +702,7 @@ spv = { Invocation = 4, QueueFamily = 5, QueueFamilyKHR = 5, + ShaderCallKHR = 6, }, GroupOperation = { diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py index 655f71b..a7344aa 100644 --- a/include/spirv/unified1/spirv.py +++ b/include/spirv/unified1/spirv.py @@ -1,4 +1,4 @@ -# Copyright (c) 2014-2019 The Khronos Group Inc. +# Copyright (c) 2014-2020 The Khronos Group Inc. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and/or associated documentation files (the "Materials"), @@ -702,6 +702,7 @@ spv = { 'Invocation' : 4, 'QueueFamily' : 5, 'QueueFamilyKHR' : 5, + 'ShaderCallKHR' : 6, }, 'GroupOperation' : { diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d index 0c94a58..2c76658 100644 --- a/include/spirv/unified1/spv.d +++ b/include/spirv/unified1/spv.d @@ -1,5 +1,5 @@ /+ - + Copyright (c) 2014-2019 The Khronos Group Inc. + + Copyright (c) 2014-2020 The Khronos Group Inc. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and/or associated documentation files (the "Materials"), @@ -742,6 +742,7 @@ enum Scope : uint Invocation = 4, QueueFamily = 5, QueueFamilyKHR = 5, + ShaderCallKHR = 6, } enum GroupOperation : uint diff --git a/tools/buildHeaders/header.cpp b/tools/buildHeaders/header.cpp index 0f65291..7e8f668 100644 --- a/tools/buildHeaders/header.cpp +++ b/tools/buildHeaders/header.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2019 The Khronos Group Inc. +// Copyright (c) 2014-2020 The Khronos Group Inc. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and/or associated documentation files (the "Materials"), @@ -169,7 +169,7 @@ namespace { } const std::string TPrinter::DocCopyright = - "Copyright (c) 2014-2019 The Khronos Group Inc.\n" + "Copyright (c) 2014-2020 The Khronos Group Inc.\n" "\n" "Permission is hereby granted, free of charge, to any person obtaining a copy\n" "of this software and/or associated documentation files (the \"Materials\"),\n" diff --git a/tools/buildHeaders/jsonToSpirv.cpp b/tools/buildHeaders/jsonToSpirv.cpp index 4649e21..689b2d6 100644 --- a/tools/buildHeaders/jsonToSpirv.cpp +++ b/tools/buildHeaders/jsonToSpirv.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2019 The Khronos Group Inc. +// Copyright (c) 2014-2020 The Khronos Group Inc. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and/or associated documentation files (the "Materials"), diff --git a/tools/buildHeaders/jsonToSpirv.h b/tools/buildHeaders/jsonToSpirv.h index 81e38c2..c37fcb9 100644 --- a/tools/buildHeaders/jsonToSpirv.h +++ b/tools/buildHeaders/jsonToSpirv.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2019 The Khronos Group Inc. +// Copyright (c) 2014-2020 The Khronos Group Inc. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and/or associated documentation files (the "Materials"), |