mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HLSL: Support semantics in function parameter declarations.

Browse Source
This commit is contained in:
John Kessenich 2016-06-17 14:21:02 -06:00
parent 21f1286f57
commit c3387d33ee
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Test/hlsl.float1.frag
View File

@ -1,7 +1,7 @@
float1 f1 = float1(1.0); float1 f1 = float1(1.0);
float scalar = 2.0; float scalar = 2.0;
float1 ShaderFunction(float1 inFloat1, float inScalar) : COLOR0 float1 ShaderFunction(float1 inFloat1 : COLOR, float inScalar) : COLOR0
{ {
return f1 * scalar + inFloat1 * inScalar; return f1 * scalar + inFloat1 * inScalar;
} }

6
hlsl/hlslGrammar.cpp
View File

@ -769,8 +769,8 @@ bool HlslGrammar::acceptFunctionParameters(TFunction& function)
} }
// parameter_declaration // parameter_declaration
// : fully_specified_type // : fully_specified_type post_decls
// | fully_specified_type identifier // | fully_specified_type identifier post_decls
// //
bool HlslGrammar::acceptParameterDeclaration(TFunction& function) bool HlslGrammar::acceptParameterDeclaration(TFunction& function)
{ {
@ -783,6 +783,8 @@ bool HlslGrammar::acceptParameterDeclaration(TFunction& function)
HlslToken idToken; HlslToken idToken;
acceptIdentifier(idToken); acceptIdentifier(idToken);
acceptPostDecls(*type);
TParameter param = { idToken.string, type }; TParameter param = { idToken.string, type };
function.addParameter(param); function.addParameter(param);