From 1c969b9a85e2e6d6981a31bb758647fc61cf6482 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Mon, 11 Feb 2019 09:41:10 -0500 Subject: [[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. --- source/slang/modifier-defs.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source/slang/modifier-defs.h') 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) -- cgit v1.2.3