Merge branch 'TiemoJung-semantic_handling'

2017-03-14 21:50:06 -06:00
parent 71c100d7c0 2dc50ff372
commit 2dd643ff03
11 changed files with 187 additions and 49 deletions
--- a/hlsl/hlslScanContext.h
+++ b/hlsl/hlslScanContext.h
@@ -82,7 +82,7 @@ public:
    static void deleteKeywordMap();

    void tokenize(HlslToken&);
-    glslang::TBuiltInVariable mapSemantic(const TString& semantic);
+    glslang::TBuiltInVariable mapSemantic(const char*);

 protected:
    HlslScanContext(HlslScanContext&);