Fix issue for new unique id system. Add level bits to help verifying symbols and split symbol tables.
For intermediates rebuilding, now need manually amending level bits for redeclaring built-ins.
This commit is contained in:
parent
74e8f05b9f
commit
93b400f267
17 changed files with 110 additions and 71 deletions
|
|
@ -1376,7 +1376,7 @@ TIntermTyped* HlslParseContext::flattenAccess(TIntermTyped* base, int member)
|
|||
|
||||
return flattened ? flattened : base;
|
||||
}
|
||||
TIntermTyped* HlslParseContext::flattenAccess(int uniqueId, int member, TStorageQualifier outerStorage,
|
||||
TIntermTyped* HlslParseContext::flattenAccess(long long uniqueId, int member, TStorageQualifier outerStorage,
|
||||
const TType& dereferencedType, int subset)
|
||||
{
|
||||
const auto flattenData = flattenMap.find(uniqueId);
|
||||
|
|
@ -1444,7 +1444,7 @@ int HlslParseContext::findSubtreeOffset(const TType& type, int subset, const TVe
|
|||
};
|
||||
|
||||
// Find and return the split IO TVariable for id, or nullptr if none.
|
||||
TVariable* HlslParseContext::getSplitNonIoVar(int id) const
|
||||
TVariable* HlslParseContext::getSplitNonIoVar(long long id) const
|
||||
{
|
||||
const auto splitNonIoVar = splitNonIoVars.find(id);
|
||||
if (splitNonIoVar == splitNonIoVars.end())
|
||||
|
|
@ -3256,7 +3256,7 @@ TIntermAggregate* HlslParseContext::handleSamplerTextureCombine(const TSourceLoc
|
|||
// shadow state. This depends on downstream optimization to
|
||||
// DCE one variant in [shadow, nonshadow] if both are present,
|
||||
// or the SPIR-V module would be invalid.
|
||||
int newId = texSymbol->getId();
|
||||
long long newId = texSymbol->getId();
|
||||
|
||||
// Check to see if this texture has been given a shadow mode already.
|
||||
// If so, look up the one we already have.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue