Fix HLSL varying struct linking.

src/compiler/translator/ParseContext.cpp

@@ -2545,7 +2545,10 @@ TPublicType TParseContext::addStructure(const TSourceLoc& structLine, const TSou
     TStructure* structure = new TStructure(structName, fieldList);
     TType* structureType = new TType(structure);
 
+    // Store a bool in the struct if we're at global scope, to allow us to
+    // skip the local struct scoping workaround in HLSL.
     structure->setUniqueId(TSymbolTable::nextUniqueId());
+    structure->setAtGlobalScope(symbolTable.atGlobalLevel());
 
     if (!structName->empty())
     {

src/compiler/translator/Types.h

@@ -113,7 +113,8 @@ class TStructure : public TFieldListCollection
     TStructure(const TString *name, TFieldList *fields)
         : TFieldListCollection(name, fields),
           mDeepestNesting(0),
-          mUniqueId(0)
+          mUniqueId(0),
+          mAtGlobalScope(false)
     {
     }
 
@@ -138,6 +139,16 @@ class TStructure : public TFieldListCollection
         return mUniqueId;
     }
 
+    void setAtGlobalScope(bool atGlobalScope)
+    {
+        mAtGlobalScope = atGlobalScope;
+    }
+
+    bool atGlobalScope() const
+    {
+        return mAtGlobalScope;
+    }
+
   private:
     DISALLOW_COPY_AND_ASSIGN(TStructure);
 
@@ -159,6 +170,7 @@ class TStructure : public TFieldListCollection
 
     mutable int mDeepestNesting;
     int mUniqueId;
+    bool mAtGlobalScope;
 };
 
 class TInterfaceBlock : public TFieldListCollection

src/compiler/translator/UtilsHLSL.cpp

@@ -175,6 +175,13 @@ TString StructNameString(const TStructure &structure)
         return "";
     }
 
+    // For structures at global scope we use a consistent
+    // translation so that we can link between shader stages.
+    if (structure.atGlobalScope())
+    {
+        return Decorate(structure.name());
+    }
+
     return "ss" + str(structure.uniqueId()) + "_" + structure.name();
 }