From 55a29042a2826f26272c9e1b65cd3745bad3ee31 Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Wed, 19 Jul 2017 10:10:17 -0700 Subject: 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") --- source/slang/modifier-defs.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source/slang/modifier-defs.h') diff --git a/source/slang/modifier-defs.h b/source/slang/modifier-defs.h index fadc68695..89f2096e4 100644 --- a/source/slang/modifier-defs.h +++ b/source/slang/modifier-defs.h @@ -59,6 +59,12 @@ SYNTAX_CLASS(RequiredGLSLExtensionModifier, Modifier) FIELD(Token, extensionNameToken) END_SYNTAX_CLASS() +// A modifier to tag something as an intrinsic that requires +// a certain GLSL version to be enabled when used +SYNTAX_CLASS(RequiredGLSLVersionModifier, Modifier) + FIELD(Token, versionNumberToken) +END_SYNTAX_CLASS() + SIMPLE_SYNTAX_CLASS(InOutModifier, OutModifier) // This is a special sentinel modifier that gets added -- cgit v1.2.3