summaryrefslogtreecommitdiffstats
path: root/source/slang/parser.cpp
diff options
context:
space:
mode:
authorTim Foley <tfoley@nvidia.com>2017-07-19 10:10:17 -0700
committerTim Foley <tfoley@nvidia.com>2017-07-19 10:12:58 -0700
commit55a29042a2826f26272c9e1b65cd3745bad3ee31 (patch)
treef8016cf92678a6dfaa1903a161ebcad78f0f42d0 /source/slang/parser.cpp
parenta727017340165d02977387e1e1a2a7e328308295 (diff)
Fix up translation of `GetDimensions()`
Fixes #122 - In cases with an explicit mip level being specified, there was a mistake in how the argument for setting the mip level in the GLSL code was constructed that led to a parse error in GLSL - Also, that argument is a `uint` in HLSL and an `int` in GLSL, so an explicit cast was needed - The GLSL functions here seem to require a newer GLSL (at least higher than `420`), so I had to add in a capability for builtins to specify a required GLSL version. For now I made these ones require `450`. - Added a test case to confirm that our lowering works (for some definition of "works")
Diffstat (limited to 'source/slang/parser.cpp')
-rw-r--r--source/slang/parser.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/source/slang/parser.cpp b/source/slang/parser.cpp
index 50205ff29..a624c58c5 100644
--- a/source/slang/parser.cpp
+++ b/source/slang/parser.cpp
@@ -729,6 +729,19 @@ namespace Slang
AddModifier(&modifierLink, modifier);
}
+ else if (AdvanceIf(parser, "__glsl_version"))
+ {
+ auto modifier = new RequiredGLSLVersionModifier();
+ modifier->Position = loc;
+
+ parser->ReadToken(TokenType::LParent);
+ modifier->versionNumberToken = parser->ReadToken(TokenType::IntegerLiteral);
+ parser->ReadToken(TokenType::RParent);
+
+ AddModifier(&modifierLink, modifier);
+ }
+
+
else if (AdvanceIf(parser, "layout"))
{
parser->ReadToken(TokenType::LParent);