diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2017-07-12 14:52:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-12 14:52:21 -0700 |
| commit | 9058358792fa393e0e92af80f24a54a037aa9691 (patch) | |
| tree | 156c36903426a4f18f0e4c857d9d9eb987459789 /source/slang/modifier-defs.h | |
| parent | 6101e483ae8ea9e10db2b5a9423af3cc7fafb710 (diff) | |
| parent | 02f77bbf12981abe376b2d5987684224a50ae4b2 (diff) | |
Merge pull request #80 from tfoleyNV/falcor-work
Fixes for shader cross-compilation
Diffstat (limited to 'source/slang/modifier-defs.h')
| -rw-r--r-- | source/slang/modifier-defs.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/source/slang/modifier-defs.h b/source/slang/modifier-defs.h index c401b3353..9806a12a5 100644 --- a/source/slang/modifier-defs.h +++ b/source/slang/modifier-defs.h @@ -53,6 +53,12 @@ SYNTAX_CLASS(TargetIntrinsicModifier, IntrinsicModifierBase) FIELD(Token, definitionToken) END_SYNTAX_CLASS() +// A modifier to tag something as an intrinsic that requires +// a certain GLSL extension to be enabled when used +SYNTAX_CLASS(RequiredGLSLExtensionModifier, Modifier) + FIELD(Token, extensionNameToken) +END_SYNTAX_CLASS() + SIMPLE_SYNTAX_CLASS(InOutModifier, OutModifier) // This is a special sentinel modifier that gets added @@ -208,17 +214,20 @@ SIMPLE_SYNTAX_CLASS(GLSLColumnMajorLayoutModifier, RowMajorLayoutModifier) // More HLSL Keyword +ABSTRACT_SYNTAX_CLASS(InterpolationModeModifier, Modifier) +END_SYNTAX_CLASS() + // HLSL `nointerpolation` modifier -SIMPLE_SYNTAX_CLASS(HLSLNoInterpolationModifier, Modifier) +SIMPLE_SYNTAX_CLASS(HLSLNoInterpolationModifier, InterpolationModeModifier) // HLSL `linear` modifier -SIMPLE_SYNTAX_CLASS(HLSLLinearModifier, Modifier) +SIMPLE_SYNTAX_CLASS(HLSLLinearModifier, InterpolationModeModifier) // HLSL `sample` modifier -SIMPLE_SYNTAX_CLASS(HLSLSampleModifier, Modifier) +SIMPLE_SYNTAX_CLASS(HLSLSampleModifier, InterpolationModeModifier) // HLSL `centroid` modifier -SIMPLE_SYNTAX_CLASS(HLSLCentroidModifier, Modifier) +SIMPLE_SYNTAX_CLASS(HLSLCentroidModifier, InterpolationModeModifier) // HLSL `precise` modifier SIMPLE_SYNTAX_CLASS(HLSLPreciseModifier, Modifier) |
