Clean up storing interface blocks in the symbol table
Merge TInterfaceBlock with TInterfaceBlockName, so that there are no
duplicate data structures for interface blocks. This is similar to the
refactoring that was already done to structs.
BUG=angleproject:2267
TEST=angle_unittests
Change-Id: I67d2af6ccbe5344bddf9c99030d118fe532fbbd8
Reviewed-on: https://chromium-review.googlesource.com/805819
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
diff --git a/src/compiler/translator/ParseContext.cpp b/src/compiler/translator/ParseContext.cpp
index 7149cde..e346b8b 100644
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -3713,11 +3713,6 @@
checkInternalFormatIsNotSpecified(nameLine, blockLayoutQualifier.imageInternalFormat);
- if (!symbolTable.declareInterfaceBlockName(&blockName))
- {
- error(nameLine, "redefinition of an interface block name", blockName.c_str());
- }
-
// check for sampler types and apply layout qualifiers
for (size_t memberIndex = 0; memberIndex < fieldList->size(); ++memberIndex)
{
@@ -3814,7 +3809,12 @@
}
TInterfaceBlock *interfaceBlock =
- new TInterfaceBlock(&blockName, fieldList, blockLayoutQualifier);
+ new TInterfaceBlock(&symbolTable, &blockName, fieldList, blockLayoutQualifier);
+ if (!symbolTable.declareInterfaceBlock(interfaceBlock))
+ {
+ error(nameLine, "redefinition of an interface block name", blockName.c_str());
+ }
+
TType interfaceBlockType(interfaceBlock, typeQualifier.qualifier, blockLayoutQualifier);
if (arrayIndex != nullptr)
{