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/hlslTokenStream.h
+++ b/hlsl/hlslTokenStream.h
@@ -52,7 +52,7 @@ namespace glslang {
        bool acceptTokenClass(EHlslTokenClass);
        EHlslTokenClass peek() const;
        bool peekTokenClass(EHlslTokenClass) const;
-        glslang::TBuiltInVariable mapSemantic(const TString& semantic) { return scanner.mapSemantic(semantic); }
+        glslang::TBuiltInVariable mapSemantic(const char* upperCase) { return scanner.mapSemantic(upperCase); }

        void pushTokenStream(const TVector<HlslToken>* tokens);
        void popTokenStream();