Index symbols by id in ValidateOutputs

This is cleaner than indexing them by their name string. BUG=angleproject:2267 TEST=angle_unittests Change-Id: I6cdc4125fadb6c7049ad8664e8a66da2a9a5bb8d Reviewed-on: https://chromium-review.googlesource.com/836892 Commit-Queue: Olli Etuaho <oetuaho@nvidia.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Index symbols by id in ValidateOutputs
aaa55bfa · Olli Etuaho · Commit Bot · 06f86377 · aaa55bfa
Commit aaa55bfa authored Dec 28, 2017 by Olli Etuaho Committed by Commit Bot Dec 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

ValidateOutputs.cpp src/compiler/translator/ValidateOutputs.cpp +6 -5

No files found.
--- a/src/compiler/translator/ValidateOutputs.cpp
+++ b/src/compiler/translator/ValidateOutputs.cpp
@@ -43,7 +43,7 @@ class ValidateOutputsTraverser : public TIntermTraverser
    OutputVector mOutputs;
    OutputVector mUnspecifiedLocationOutputs;
    OutputVector mYuvOutputs;
-    std::set<std::string> mVisitedSymbols;
+    std::set<int> mVisitedSymbols;  // Visited symbol ids.
 };
 ValidateOutputsTraverser::ValidateOutputsTraverser(const TExtensionBehavior &extBehavior,
@@ -58,14 +58,15 @@ ValidateOutputsTraverser::ValidateOutputsTraverser(const TExtensionBehavior &ext
 void ValidateOutputsTraverser::visitSymbol(TIntermSymbol *symbol)
 {
-    TString name         = symbol->getSymbol();
+    if (symbol->variable().symbolType() == SymbolType::Empty)
-    TQualifier qualifier = symbol->getQualifier();
+        return;
-    if (mVisitedSymbols.count(name.c_str()) == 1)
+    if (mVisitedSymbols.count(symbol->uniqueId().get()) == 1)
        return;
-    mVisitedSymbols.insert(name.c_str());
+    mVisitedSymbols.insert(symbol->uniqueId().get());
+    TQualifier qualifier = symbol->getQualifier();
    if (qualifier == EvqFragmentOut)
    {
        if (symbol->getType().getLayoutQualifier().location != -1)