summaryrefslogtreecommitdiff
path: root/source/slang/modifier-defs.h
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2019-02-11 09:41:10 -0500
committerGitHub <noreply@github.com>2019-02-11 09:41:10 -0500
commit1c969b9a85e2e6d6981a31bb758647fc61cf6482 (patch)
tree1c5df51b207c43198f360d353108666ab234cc4b /source/slang/modifier-defs.h
parent9f8a92e468a626abf82d08a730e009321595da07 (diff)
[[vk::shader_record]] (#836)
* * Replaced ShaderRecordNVLayoutModifier with ShaderRecordAttribute * Allowed attributed [[vk::shader_record] and [[shader_record]] * Checking there is at most 1 ShaderRecord active * Small typo fixes * Slightly improve diagnostic. Replace expected file.
Diffstat (limited to 'source/slang/modifier-defs.h')
-rw-r--r--source/slang/modifier-defs.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/slang/modifier-defs.h b/source/slang/modifier-defs.h
index 164621620..76d806fea 100644
--- a/source/slang/modifier-defs.h
+++ b/source/slang/modifier-defs.h
@@ -136,8 +136,6 @@ SIMPLE_SYNTAX_CLASS(GLSLLocalSizeXLayoutModifier, GLSLLocalSizeLayoutModifier
SIMPLE_SYNTAX_CLASS(GLSLLocalSizeYLayoutModifier, GLSLLocalSizeLayoutModifier)
SIMPLE_SYNTAX_CLASS(GLSLLocalSizeZLayoutModifier, GLSLLocalSizeLayoutModifier)
-SIMPLE_SYNTAX_CLASS(ShaderRecordNVLayoutModifier, GLSLParsedLayoutModifier)
-
// A catch-all for single-keyword modifiers
SIMPLE_SYNTAX_CLASS(SimpleModifier, Modifier)
@@ -342,6 +340,9 @@ SIMPLE_SYNTAX_CLASS(CallAttribute, Attribute) // `[call]`
// [[vk_push_constant]] [[push_constant]]
SIMPLE_SYNTAX_CLASS(PushConstantAttribute, Attribute)
+// [[vk_shader_record]] [[shader_record]]
+SIMPLE_SYNTAX_CLASS(ShaderRecordAttribute, Attribute)
+
// [[vk_binding]]
SYNTAX_CLASS(GLSLBindingAttribute, Attribute)
FIELD(int32_t, binding = 0)