Revert "Allow varying structs to match between stages."

src/compiler/translator/ParseContext.cpp

@@ -2545,12 +2545,7 @@ TPublicType TParseContext::addStructure(const TSourceLoc& structLine, const TSou
     TStructure* structure = new TStructure(structName, fieldList);
     TType* structureType = new TType(structure);
 
-    // Check for global struct, and do not assign an ID if so, to prevent us from
-    // rewriting the struct name to avoid scoping conflicts.
-    if (!symbolTable.atGlobalLevel())
-    {
-        structure->setUniqueId(TSymbolTable::nextUniqueId());
-    }
+    structure->setUniqueId(TSymbolTable::nextUniqueId());
 
     if (!structName->empty())
     {

src/compiler/translator/Types.h

@@ -134,6 +134,7 @@ class TStructure : public TFieldListCollection
 
     int uniqueId() const
     {
+        ASSERT(mUniqueId != 0);
         return mUniqueId;
     }
 

src/compiler/translator/UtilsHLSL.cpp

@@ -175,13 +175,6 @@ TString StructNameString(const TStructure &structure)
         return "";
     }
 
-    // For structures at global scope (tagged with ID 0) we use a consistent
-    // translation so that we can link varying structs.
-    if (structure.uniqueId() == 0)
-    {
-        return Decorate(structure.name());
-    }
-
     return "ss" + str(structure.uniqueId()) + "_" + structure.name();
 }