From b1344c0d19913736c85170c72aefb2e246cef1b4 Mon Sep 17 00:00:00 2001 From: Ehsan Nasiri Date: Mon, 10 Jun 2019 11:12:25 -0400 Subject: [PATCH] Add grammar and symbols for UserTypeGOOGLE extension to unified1. --- include/spirv/unified1/spirv.core.grammar.json | 9 +++++++++ include/spirv/unified1/spirv.h | 1 + include/spirv/unified1/spirv.hpp | 1 + include/spirv/unified1/spirv.hpp11 | 1 + include/spirv/unified1/spirv.json | 3 ++- include/spirv/unified1/spirv.lua | 1 + include/spirv/unified1/spirv.py | 1 + 7 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/spirv/unified1/spirv.core.grammar.json b/include/spirv/unified1/spirv.core.grammar.json index 5ddb62a..c3f4239 100644 --- a/include/spirv/unified1/spirv.core.grammar.json +++ b/include/spirv/unified1/spirv.core.grammar.json @@ -7888,6 +7888,15 @@ ], "extensions" : [ "SPV_GOOGLE_hlsl_functionality1" ], "version" : "None" + }, + { + "enumerant" : "UserTypeGOOGLE", + "value" : 5636, + "parameters" : [ + { "kind" : "LiteralString", "name" : "'User Type'" } + ], + "extensions" : [ "SPV_GOOGLE_user_type" ], + "version" : "None" } ] }, diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h index 99b6fbb..73389fe 100644 --- a/include/spirv/unified1/spirv.h +++ b/include/spirv/unified1/spirv.h @@ -459,6 +459,7 @@ typedef enum SpvDecoration_ { SpvDecorationHlslCounterBufferGOOGLE = 5634, SpvDecorationHlslSemanticGOOGLE = 5635, SpvDecorationUserSemantic = 5635, + SpvDecorationUserTypeGOOGLE = 5636, SpvDecorationMax = 0x7fffffff, } SpvDecoration; diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp index 03ba767..6a8a6ff 100644 --- a/include/spirv/unified1/spirv.hpp +++ b/include/spirv/unified1/spirv.hpp @@ -455,6 +455,7 @@ enum Decoration { DecorationHlslCounterBufferGOOGLE = 5634, DecorationHlslSemanticGOOGLE = 5635, DecorationUserSemantic = 5635, + DecorationUserTypeGOOGLE = 5636, DecorationMax = 0x7fffffff, }; diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11 index 8d53ed5..949435c 100644 --- a/include/spirv/unified1/spirv.hpp11 +++ b/include/spirv/unified1/spirv.hpp11 @@ -455,6 +455,7 @@ enum class Decoration : unsigned { HlslCounterBufferGOOGLE = 5634, HlslSemanticGOOGLE = 5635, UserSemantic = 5635, + UserTypeGOOGLE = 5636, Max = 0x7fffffff, }; diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json index ef73efb..f57b42f 100644 --- a/include/spirv/unified1/spirv.json +++ b/include/spirv/unified1/spirv.json @@ -488,7 +488,8 @@ "CounterBuffer": 5634, "HlslCounterBufferGOOGLE": 5634, "HlslSemanticGOOGLE": 5635, - "UserSemantic": 5635 + "UserSemantic": 5635, + "UserTypeGOOGLE": 5636 } }, { diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua index a03fa5d..76576ed 100644 --- a/include/spirv/unified1/spirv.lua +++ b/include/spirv/unified1/spirv.lua @@ -428,6 +428,7 @@ spv = { HlslCounterBufferGOOGLE = 5634, HlslSemanticGOOGLE = 5635, UserSemantic = 5635, + UserTypeGOOGLE = 5636, }, BuiltIn = { diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py index 5ef4e99..6ce550b 100644 --- a/include/spirv/unified1/spirv.py +++ b/include/spirv/unified1/spirv.py @@ -428,6 +428,7 @@ spv = { 'HlslCounterBufferGOOGLE' : 5634, 'HlslSemanticGOOGLE' : 5635, 'UserSemantic' : 5635, + 'UserTypeGOOGLE' : 5635, }, 'BuiltIn' : { -- 2.7.4