Skip to content

Commit 5cd4f29

Browse files
authored
Update SymbolTable.cpp
1 parent acfb3ca commit 5cd4f29

1 file changed

Lines changed: 17 additions & 8 deletions

File tree

src/compiler/translator/SymbolTable.cpp

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -525,17 +525,19 @@ const TSymbol *SymbolRule::get(ShShaderSpec shaderSpec,
525525
const ShBuiltInResources &resources,
526526
const TSymbolTableBase &symbolTable) const
527527
{
528-
/*if (mVersion == kESSL1Only && shaderVersion != static_cast<int>(kESSL1Only))
528+
if (!std::getenv("ANGLE_SYMBOLTABAL_RELIEF")) {
529+
if (mVersion == kESSL1Only && shaderVersion != static_cast<int>(kESSL1Only))
529530
return nullptr;
530531

531532
if (mVersion > shaderVersion)
532-
return nullptr;*/
533+
return nullptr;
533534

534535
if (!CheckShaderType(static_cast<Shader>(mShaders), shaderType))
535536
return nullptr;
536537

537-
/*if (mExtensionIndex != 0 && !CheckExtension(mExtensionIndex, resources))
538-
return nullptr;*/
538+
if (mExtensionIndex != 0 && !CheckExtension(mExtensionIndex, resources))
539+
return nullptr;
540+
}
539541

540542
return mIsVar > 0 ? symbolTable.*(mSymbolOrVar.var) : mSymbolOrVar.symbol;
541543
}
@@ -568,19 +570,23 @@ bool UnmangledEntry::matches(const ImmutableString &name,
568570
sh::GLenum shaderType,
569571
const TExtensionBehavior &extensions) const
570572
{
573+
574+
if (!std::getenv("ANGLE_SYMBOLTABAL_RELIEF")) {
571575
if (name != mName)
572576
return false;
573577

574578
if (!CheckShaderType(static_cast<Shader>(mShaderType), shaderType))
575579
return false;
576580

577-
/*if (mESSLVersion == kESSL1Only && shaderVersion != static_cast<int>(kESSL1Only))
581+
if (mESSLVersion == kESSL1Only && shaderVersion != static_cast<int>(kESSL1Only))
578582
return false;
579583

580584
if (mESSLVersion > shaderVersion)
581-
return false;*/
585+
return false;
586+
}
582587

583-
/*bool anyExtension = false;
588+
if (!std::getenv("ANGLE_SYMBOLTABAL_RELIEF")) {
589+
bool anyExtension = false;
584590
bool anyExtensionEnabled = false;
585591
for (TExtension ext : mESSLExtensions)
586592
{
@@ -594,8 +600,11 @@ bool UnmangledEntry::matches(const ImmutableString &name,
594600
if (!anyExtension)
595601
return true;
596602

597-
return anyExtensionEnabled;*/
603+
return anyExtensionEnabled;
604+
} else {
605+
598606
return true;
607+
}
599608

600609
}
601610
} // namespace sh

0 commit comments

Comments
 (0)