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

Merge pull request #2540 from dgkoch/dgkoch_build_fix

Browse Source 
Fix warning in build
This commit is contained in:
greg-lunarg
2021-02-22 17:07:33 -07:00
committed by GitHub
parent 5421877c38 d9b931e2e8
commit c8b95db65e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glslang/MachineIndependent/SymbolTable.h
View File

@@ -698,7 +698,7 @@ public:
void amendSymbolIdLevel(TSymbol& symbol) void amendSymbolIdLevel(TSymbol& symbol)
{ {
// clamp level to avoid overflow // clamp level to avoid overflow
uint64_t level = currentLevel() > MaxLevelInUniqueID ? MaxLevelInUniqueID : currentLevel(); uint64_t level = (uint32_t)currentLevel() > MaxLevelInUniqueID ? MaxLevelInUniqueID : currentLevel();
uint64_t symbolId = symbol.getUniqueId(); uint64_t symbolId = symbol.getUniqueId();
symbolId &= uniqueIdMask; symbolId &= uniqueIdMask;
symbolId |= (level << LevelFlagBitOffset); symbolId |= (level << LevelFlagBitOffset);
@@ -889,7 +889,7 @@ public:
// Add current level in the high-bits of unique id // Add current level in the high-bits of unique id
void updateUniqueIdLevelFlag() { void updateUniqueIdLevelFlag() {
// clamp level to avoid overflow // clamp level to avoid overflow
uint64_t level = currentLevel() > MaxLevelInUniqueID ? MaxLevelInUniqueID : currentLevel(); uint64_t level = (uint32_t)currentLevel() > MaxLevelInUniqueID ? MaxLevelInUniqueID : currentLevel();
uniqueId &= uniqueIdMask; uniqueId &= uniqueIdMask;
uniqueId |= (level << LevelFlagBitOffset); uniqueId |= (level << LevelFlagBitOffset);
} }