Merge pull request #1094 from LoopDawg/split-shadow-tx

glslang/Include/intermediate.h

@@ -984,7 +984,6 @@ public:
         constSubtree(nullptr)
           { name = n; }
     virtual int getId() const { return id; }
-    virtual void setId(int newId) { id = newId; }
     virtual const TString& getName() const { return name; }
     virtual void traverse(TIntermTraverser*);
     virtual       TIntermSymbol* getAsSymbolNode()       { return this; }
@@ -998,6 +997,10 @@ public:
     int getFlattenSubset() const { return flattenSubset; } // -1 means full object
 #endif
 
+    // This is meant for cases where a node has already been constructed, and
+    // later on, it becomes necessary to switch to a different symbol.
+    virtual void switchId(int newId) { id = newId; }
+
 protected:
     int id;                      // the unique id of the symbol this node represents
 #ifdef ENABLE_HLSL

hlsl/hlslParseHelper.cpp

@@ -2994,7 +2994,7 @@ TIntermAggregate* HlslParseContext::handleSamplerTextureCombine(const TSourceLoc
         argTex->getWritableType().getSampler().shadow = shadowMode;
         samplerType.shadow = shadowMode;
 
-        texSymbol->setId(newId);
+        texSymbol->switchId(newId);
     }
 
     txcombine->setType(TType(samplerType, EvqTemporary));