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

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

Browse Source 
HLSL: nonfunctional: rename setId -> switchId, add comment
This commit is contained in:
John Kessenich 2017-10-11 01:48:49 +03:00 committed by GitHub
commit ad2bc097e2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glslang/Include/intermediate.h
View File

@ -984,7 +984,6 @@ public:
constSubtree(nullptr) constSubtree(nullptr)
{ name = n; } { name = n; }
virtual int getId() const { return id; } virtual int getId() const { return id; }
virtual void setId(int newId) { id = newId; }
virtual const TString& getName() const { return name; } virtual const TString& getName() const { return name; }
virtual void traverse(TIntermTraverser*); virtual void traverse(TIntermTraverser*);
virtual TIntermSymbol* getAsSymbolNode() { return this; } virtual TIntermSymbol* getAsSymbolNode() { return this; }
@ -998,6 +997,10 @@ public:
int getFlattenSubset() const { return flattenSubset; } // -1 means full object int getFlattenSubset() const { return flattenSubset; } // -1 means full object
#endif #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: protected:
int id; // the unique id of the symbol this node represents int id; // the unique id of the symbol this node represents
#ifdef ENABLE_HLSL #ifdef ENABLE_HLSL

2
hlsl/hlslParseHelper.cpp
View File

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