Vulkan: Use TSymbolTable in ExtractStructSamplers.

src/compiler/translator/SymbolTable.cpp

@@ -24,7 +24,7 @@ namespace sh
 class TSymbolTable::TSymbolTableLevel
 {
   public:
-    TSymbolTableLevel() {}
+    TSymbolTableLevel() = default;
 
     bool insert(TSymbol *symbol);
 
@@ -86,8 +86,8 @@ bool TSymbolTable::atGlobalLevel() const
 
 void TSymbolTable::push()
 {
-    mTable.push_back(std::unique_ptr<TSymbolTableLevel>(new TSymbolTableLevel));
-    mPrecisionStack.push_back(std::unique_ptr<PrecisionStackLevel>(new PrecisionStackLevel));
+    mTable.emplace_back(new TSymbolTableLevel);
+    mPrecisionStack.emplace_back(new PrecisionStackLevel);
 }
 
 void TSymbolTable::pop()
@@ -98,7 +98,7 @@ void TSymbolTable::pop()
 
 const TFunction *TSymbolTable::markFunctionHasPrototypeDeclaration(
     const ImmutableString &mangledName,
-    bool *hadPrototypeDeclarationOut)
+    bool *hadPrototypeDeclarationOut) const
 {
     TFunction *function         = findUserDefinedFunction(mangledName);
     *hadPrototypeDeclarationOut = function->hasPrototypeDeclaration();
@@ -107,7 +107,7 @@ const TFunction *TSymbolTable::markFunctionHasPrototypeDeclaration(
 }
 
 const TFunction *TSymbolTable::setFunctionParameterNamesFromDefinition(const TFunction *function,
-                                                                       bool *wasDefinedOut)
+                                                                       bool *wasDefinedOut) const
 {
     TFunction *firstDeclaration = findUserDefinedFunction(function->getMangledName());
     ASSERT(firstDeclaration);
@@ -213,6 +213,17 @@ void TSymbolTable::setGlobalInvariant(bool invariant)
 
 const TSymbol *TSymbolTable::find(const ImmutableString &name, int shaderVersion) const
 {
+    const TSymbol *userSymbol = findUserDefined(name);
+    if (userSymbol)
+    {
+        return userSymbol;
+    }
+
+    return findBuiltIn(name, shaderVersion);
+}
+
+const TSymbol *TSymbolTable::findUserDefined(const ImmutableString &name) const
+{
     int userDefinedLevel = static_cast<int>(mTable.size()) - 1;
     while (userDefinedLevel >= 0)
     {
@@ -224,7 +235,7 @@ const TSymbol *TSymbolTable::find(const ImmutableString &name, int shaderVersion
         userDefinedLevel--;
     }
 
-    return findBuiltIn(name, shaderVersion);
+    return nullptr;
 }
 
 TFunction *TSymbolTable::findUserDefinedFunction(const ImmutableString &name) const
@@ -248,6 +259,14 @@ bool TSymbolTable::declare(TSymbol *symbol)
     return mTable.back()->insert(symbol);
 }
 
+bool TSymbolTable::declareInternal(TSymbol *symbol)
+{
+    ASSERT(!mTable.empty());
+    ASSERT(symbol->symbolType() == SymbolType::AngleInternal);
+    ASSERT(!symbol->isFunction());
+    return mTable.back()->insert(symbol);
+}
+
 void TSymbolTable::declareUserDefinedFunction(TFunction *function, bool insertUnmangledName)
 {
     ASSERT(!mTable.empty());
@@ -299,7 +318,7 @@ void TSymbolTable::clearCompilationResults()
     mGlInVariableWithArraySize = nullptr;
 
     // User-defined scopes should have already been cleared when the compilation finished.
-    ASSERT(mTable.size() == 0u);
+    ASSERT(mTable.empty());
 }
 
 int TSymbolTable::nextUniqueIdValue()
@@ -316,7 +335,7 @@ void TSymbolTable::initializeBuiltIns(sh::GLenum type,
     mResources  = resources;
 
     // We need just one precision stack level for predefined precisions.
-    mPrecisionStack.push_back(std::unique_ptr<PrecisionStackLevel>(new PrecisionStackLevel));
+    mPrecisionStack.emplace_back(new PrecisionStackLevel);
 
     switch (type)
     {
@@ -359,5 +378,4 @@ void TSymbolTable::initSamplerDefaultPrecision(TBasicType samplerType)
 TSymbolTable::VariableMetadata::VariableMetadata() : staticRead(false), staticWrite(false), invariant(false)
 {
 }
-
 }  // namespace sh

src/compiler/translator/SymbolTable.h

@@ -82,14 +82,17 @@ class TSymbolTable : angle::NonCopyable, TSymbolTableBase
     // successful, and false if the declaration failed due to redefinition.
     bool declare(TSymbol *symbol);
 
+    // Only used to declare internal variables.
+    bool declareInternal(TSymbol *symbol);
+
     // Functions are always declared at global scope.
     void declareUserDefinedFunction(TFunction *function, bool insertUnmangledName);
 
     // These return the TFunction pointer to keep using to refer to this function.
     const TFunction *markFunctionHasPrototypeDeclaration(const ImmutableString &mangledName,
-                                                         bool *hadPrototypeDeclarationOut);
+                                                         bool *hadPrototypeDeclarationOut) const;
     const TFunction *setFunctionParameterNamesFromDefinition(const TFunction *function,
-                                                             bool *wasDefinedOut);
+                                                             bool *wasDefinedOut) const;
 
     // Return false if the gl_in array size has already been initialized with a mismatching value.
     bool setGlInArraySize(unsigned int inputArraySize);
@@ -108,6 +111,8 @@ class TSymbolTable : angle::NonCopyable, TSymbolTableBase
     // with a reference to a short-lived char * is fine to pass here.
     const TSymbol *find(const ImmutableString &name, int shaderVersion) const;
 
+    const TSymbol *findUserDefined(const ImmutableString &name) const;
+
     const TSymbol *findGlobal(const ImmutableString &name) const;
 
     const TSymbol *findBuiltIn(const ImmutableString &name, int shaderVersion) const;

src/compiler/translator/tree_ops/RewriteStructSamplers.cpp

@@ -22,8 +22,11 @@ class Traverser final : public TIntermTraverser
     explicit Traverser(TSymbolTable *symbolTable)
         : TIntermTraverser(true, false, false, symbolTable), mRemovedUniformsCount(0)
     {
+        mSymbolTable->push();
     }
 
+    ~Traverser() override { mSymbolTable->pop(); }
+
     int removedUniformsCount() const { return mRemovedUniformsCount; }
 
     bool visitDeclaration(Visit visit, TIntermDeclaration *decl) override
@@ -103,7 +106,8 @@ class Traverser final : public TIntermTraverser
 
             ImmutableString newName(stringBuilder);
 
-            TVariable *samplerReplacement = mExtractedSamplers[newName];
+            const TVariable *samplerReplacement =
+                static_cast<const TVariable *>(mSymbolTable->findUserDefined(newName));
             ASSERT(samplerReplacement);
 
             TIntermSymbol *replacement = new TIntermSymbol(samplerReplacement);
@@ -260,11 +264,10 @@ class Traverser final : public TIntermTraverser
 
         newSequence->push_back(samplerDecl);
 
-        mExtractedSamplers[newName] = newVariable;
+        mSymbolTable->declareInternal(newVariable);
     }
 
     int mRemovedUniformsCount;
-    std::map<ImmutableString, TVariable *> mExtractedSamplers;
     std::set<ImmutableString> mRemovedStructs;
 };
 }  // anonymous namespace