Merge branch 'TiemoJung-semantic_handling'

diff --cc glslang/Include/Types.h
index 4d3c4b90508d2875c298c59e6bf41a0588622972,7078d8fdcb8a0a439f1116a42a0d564619ff06e6..f2b786eb4ecde4ec290eeaab41d4c406093ba6e1
--- 1/glslang/Include/Types.h
--- 2/glslang/Include/Types.h
+++ b/glslang/Include/Types.h
@@@ -451,6 -454,12 +452,7 @@@ public
          specConstant = false;
      }
  
 -    bool hasSemantic() const
 -    {
 -      return semanticName != nullptr;
 -    }
 -
+     const char*         semanticName;
      TStorageQualifier   storage   : 6;
      TBuiltInVariable    builtIn   : 8;
      TPrecisionQualifier precision : 3;

diff --cc glslang/Include/revision.h
index ea24000f6d7df374fd1d80e890ae7b58f16ad307,ea24000f6d7df374fd1d80e890ae7b58f16ad307..162e400bc7310f33398130460007efef42ef3d8c
--- 1/glslang/Include/revision.h
--- 2/glslang/Include/revision.h
+++ b/glslang/Include/revision.h
@@@ -2,5 -2,5 +2,5 @@@
  // For the version, it uses the latest git tag followed by the number of commits.
  // For the date, it uses the current date (when then script is run).
  
--#define GLSLANG_REVISION "Overload400-PrecQual.1911"
++#define GLSLANG_REVISION "Overload400-PrecQual.1914"
  #define GLSLANG_DATE "14-Mar-2017"

diff --cc glslang/MachineIndependent/iomapper.cpp
index 07aa476284e7e7d61a112aae12299a8320e6b3c9,a478a2ca08c200ce188c4c81dd7f4abc2a96887f..bebf775d9189daedbb5a8517ddb76f44859413e1
--- 1/glslang/MachineIndependent/iomapper.cpp
--- 2/glslang/MachineIndependent/iomapper.cpp
+++ b/glslang/MachineIndependent/iomapper.cpp
@@@ -122,13 -127,22 +127,21 @@@ public
  
      virtual void visitSymbol(TIntermSymbol* base)
      {
-         if (base->getType().getQualifier().isUniformOrBuffer()) {
 -        TVarLiveMap* target;
++        TVarLiveMap* target = nullptr;
+         if (base->getQualifier().storage == EvqVaryingIn)
+             target = &inputList;
+         else if (base->getQualifier().storage == EvqVaryingOut)
+             target = &outputList;
 -        else if (base->getType().getQualifier().isUniformOrBuffer())
++        else if (base->getQualifier().isUniformOrBuffer())
+             target = &uniformList;
 -        else
 -            target = nullptr;
++
+         if (target) {
              TVarEntryInfo ent = { base->getId(), base, !traverseAll };
-             TVarLiveMap::iterator at = std::lower_bound(varLiveList.begin(), varLiveList.end(), ent, TVarEntryInfo::TOrderById());
-             if (at != varLiveList.end() && at->id == ent.id)
+             TVarLiveMap::iterator at = std::lower_bound(target->begin(), target->end(), ent, TVarEntryInfo::TOrderById());
+             if (at != target->end() && at->id == ent.id)
                at->live = at->live || !traverseAll; // update live state
              else
-               varLiveList.insert(at, ent);
+               target->insert(at, ent);
          }
      }
  
@@@ -148,11 -166,22 +165,22 @@@ public
  
      virtual void visitSymbol(TIntermSymbol* base)
      {
 -        else if (base->getQualifier().storage == EvqUniform)
+         const TVarLiveMap* source;
+         if (base->getQualifier().storage == EvqVaryingIn)
+             source = &inputList;
+         else if (base->getQualifier().storage == EvqVaryingOut)
+             source = &outputList;
++        else if (base->getQualifier().isUniformOrBuffer())
+             source = &uniformList;
+         else
+             return;
+ 
          TVarEntryInfo ent = { base->getId() };
-         TVarLiveMap::const_iterator at = std::lower_bound(varLiveList.begin(), varLiveList.end(), ent, TVarEntryInfo::TOrderById());
-         if (at == varLiveList.end())
+         TVarLiveMap::const_iterator at = std::lower_bound(source->begin(), source->end(), ent, TVarEntryInfo::TOrderById());
+         if (at == source->end())
              return;
-         if (!(at->id == ent.id))
+ 
+         if (at->id != ent.id)
              return;
  
          if (at->newBinding != -1)
@@@ -216,8 -313,8 +312,8 @@@ private
  
  /*
   * Basic implementation of glslang::TIoMapResolver that replaces the
-- * previous offset behaviour.
-- * It does the same, uses the offsets for th corresponding uniform
++ * previous offset behavior.
++ * It does the same, uses the offsets for the corresponding uniform
   * types. Also respects the EOptionAutoMapBindings flag and binds
   * them if needed.
   */

diff --cc glslang/MachineIndependent/localintermediate.h
index 34940a6982c57e59e615d505bc5362d2ae67178d,e9ed67ac065a14414df7bb4a841bc024b8a6864b..392a2ab09e99f74cc6b0db3b92669c7b61b150fb
--- 1/glslang/MachineIndependent/localintermediate.h
--- 2/glslang/MachineIndependent/localintermediate.h
+++ b/glslang/MachineIndependent/localintermediate.h
@@@ -423,6 -423,11 +423,11 @@@ public
      bool getGeoPassthroughEXT() const { return geoPassthroughEXT; }
  #endif
  
 -      return semanticNameSet.insert(name).first->c_str();
+     const char* addSemanticName(const TString& name)
+     {
++        return semanticNameSet.insert(name).first->c_str();
+     }
+ 
  protected:
      TIntermSymbol* addSymbol(int Id, const TString&, const TType&, const TConstUnionArray&, TIntermTyped* subtree, const TSourceLoc&);
      void error(TInfoSink& infoSink, const char*);

diff --cc hlsl/hlslGrammar.cpp
index 166141b3e12df15045a8d7c228cff3406ce454a1,166141b3e12df15045a8d7c228cff3406ce454a1..7a0172c847c7e174366c86f7513c9b4354db7d9f
--- 1/hlsl/hlslGrammar.cpp
--- 2/hlsl/hlslGrammar.cpp
+++ b/hlsl/hlslGrammar.cpp
@@@ -3528,7 -3528,7 +3528,9 @@@ bool HlslGrammar::acceptPostDecls(TQual
                  parseContext.handleRegister(registerDesc.loc, qualifier, profile.string, *registerDesc.string, subComponent, spaceDesc.string);
              } else {
                  // semantic, in idToken.string
--                parseContext.handleSemantic(idToken.loc, qualifier, mapSemantic(*idToken.string));
++                TString semanticUpperCase = *idToken.string;
++                std::transform(semanticUpperCase.begin(), semanticUpperCase.end(), semanticUpperCase.begin(), ::toupper);
++                parseContext.handleSemantic(idToken.loc, qualifier, mapSemantic(semanticUpperCase.c_str()), semanticUpperCase);
              }
          } else if (peekTokenClass(EHTokLeftAngle)) {
              found = true;

diff --cc hlsl/hlslParseHelper.cpp
index 3c88d47b532b306ae5d3b45fce53202eed6814e3,358f9c56788cbe297adda22bcdc328d6cab4f021..34cf5d37d5b9a3684725e7228967de9f214ce5ca
--- 1/hlsl/hlslParseHelper.cpp
--- 2/hlsl/hlslParseHelper.cpp
+++ b/hlsl/hlslParseHelper.cpp
@@@ -4144,7 -4144,7 +4144,7 @@@ TFunction* HlslParseContext::handleCons
  // Handle seeing a "COLON semantic" at the end of a type declaration,
  // by updating the type according to the semantic.
  //
--void HlslParseContext::handleSemantic(TSourceLoc loc, TQualifier& qualifier, TBuiltInVariable builtIn)
++void HlslParseContext::handleSemantic(TSourceLoc loc, TQualifier& qualifier, TBuiltInVariable builtIn, const TString& upperCase)
  {
      // adjust for stage in/out
  
@@@ -4161,6 -4161,7 +4161,7 @@@
      }
  
      qualifier.builtIn = builtIn;
 -    qualifier.semanticName = intermediate.addSemanticName(semanticUpperCase);
++    qualifier.semanticName = intermediate.addSemanticName(upperCase);
  }
  
  //

diff --cc hlsl/hlslParseHelper.h
index 2f6f24c7ecc2e90dc8cb925de21ac36f88039947,2f6f24c7ecc2e90dc8cb925de21ac36f88039947..602bb86acfec597fd7ba6e3d687666e427e15da3
--- 1/hlsl/hlslParseHelper.h
--- 2/hlsl/hlslParseHelper.h
+++ b/hlsl/hlslParseHelper.h
@@@ -91,7 -91,7 +91,7 @@@ public
      TIntermTyped* addOutputArgumentConversions(const TFunction&, TIntermOperator&);
      void builtInOpCheck(const TSourceLoc&, const TFunction&, TIntermOperator&);
      TFunction* handleConstructorCall(const TSourceLoc&, const TType&);
--    void handleSemantic(TSourceLoc, TQualifier&, TBuiltInVariable);
++    void handleSemantic(TSourceLoc, TQualifier&, TBuiltInVariable, const TString& upperCase);
      void handlePackOffset(const TSourceLoc&, TQualifier&, const glslang::TString& location,
                            const glslang::TString* component);
      void handleRegister(const TSourceLoc&, TQualifier&, const glslang::TString* profile, const glslang::TString& desc,

diff --cc hlsl/hlslScanContext.cpp
index ba8088bc12652b573037eb110a71b0b1493ffa47,ba8088bc12652b573037eb110a71b0b1493ffa47..d08a2c365504c5a97657041ef103393596d2082d
--- 1/hlsl/hlslScanContext.cpp
--- 2/hlsl/hlslScanContext.cpp
+++ b/hlsl/hlslScanContext.cpp
@@@ -467,12 -467,12 +467,9 @@@ void HlslScanContext::tokenize(HlslToke
      token.tokenClass = tokenClass;
  }
  
--glslang::TBuiltInVariable HlslScanContext::mapSemantic(const TString& semantic)
++glslang::TBuiltInVariable HlslScanContext::mapSemantic(const char* upperCase)
  {
--    TString semanticUpperCase = semantic;
--    std::transform(semanticUpperCase.begin(), semanticUpperCase.end(), semanticUpperCase.begin(), ::toupper);
--
--    auto it = SemanticMap->find(semanticUpperCase.c_str());
++    auto it = SemanticMap->find(upperCase);
      if (it != SemanticMap->end())
          return it->second;
      else

diff --cc hlsl/hlslScanContext.h
index bb8b09e85dd823036ac8079c52fed133be2441f3,bb8b09e85dd823036ac8079c52fed133be2441f3..c6f47ff5001a3a4fdb0d50d7076a1e4645939040
--- 1/hlsl/hlslScanContext.h
--- 2/hlsl/hlslScanContext.h
+++ b/hlsl/hlslScanContext.h
@@@ -82,7 -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&);

diff --cc hlsl/hlslTokenStream.h
index 333fef96a63e776df8c8b7e3bb6956eec1e14927,333fef96a63e776df8c8b7e3bb6956eec1e14927..cb6c9e7234fecf23c8069c30c8f6770aefc1523f
--- 1/hlsl/hlslTokenStream.h
--- 2/hlsl/hlslTokenStream.h
+++ b/hlsl/hlslTokenStream.h
@@@ -52,7 -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();