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

HLSL: Move to correct parsing of annotations, improving all annotations and recent string grammar.

Browse Source
This commit is contained in:
John Kessenich
2016-09-20 13:22:58 -06:00
parent 2572b19e94
commit a1e2d4952e
8 changed files with 40 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hlsl/hlslScanContext.cpp
View File

@@ -122,9 +122,9 @@ void HlslScanContext::fillInKeywordMap()
(*KeywordMap)["Buffer"] = EHTokBuffer;
(*KeywordMap)["vector"] = EHTokVector;
(*KeywordMap)["matrix"] = EHTokMatrix;
(*KeywordMap)["string"] = EHTokString;
(*KeywordMap)["void"] = EHTokVoid;
(*KeywordMap)["string"] = EHTokString;
(*KeywordMap)["bool"] = EHTokBool;
(*KeywordMap)["int"] = EHTokInt;
(*KeywordMap)["uint"] = EHTokUint;
@@ -472,11 +472,11 @@ EHlslTokenClass HlslScanContext::tokenizeIdentifier()
case EHTokBuffer:
case EHTokVector:
case EHTokMatrix:
case EHTokString:
return keyword;
// scalar types
case EHTokVoid:
case EHTokString:
case EHTokBool:
case EHTokInt:
case EHTokUint: