Merge branch 'HLSL_Semantic_Mapping' of https://github.com/dankbaker/glslang into dankbaker-HLSL_Semantic_Mapping

This commit is contained in:
John Kessenich
2016-08-29 16:07:29 -06:00
4 changed files with 115 additions and 24 deletions

View File

@@ -2670,7 +2670,7 @@ void HlslGrammar::acceptPostDecls(TType& type)
parseContext.handleRegister(registerDesc.loc, type, profile.string, *registerDesc.string, subComponent);
} else {
// semantic, in idToken.string
parseContext.handleSemantic(type, *idToken.string);
parseContext.handleSemantic(idToken.loc, type, *idToken.string);
}
} else if (acceptTokenClass(EHTokLeftAngle)) {
// TODO: process annotations, just accepting them for now