Allow varying structs to match between stages.

We would always expand a struct name to always include its symbol ID. This workaround fixed scoped structs with the same name. It would also block any possiblity of linking the structs successfully. Instead we can use the workaround only on inner-scoped structs, and leave global structs, which are by definition uniquely named, as they are. This fixes several tests in dEQP's shader.linkage.varying.struct. BUG=angle:910 Change-Id: I81b8dadc7ea493152aff0c44d607114eaaabb142 Reviewed-on: https://chromium-review.googlesource.com/247242Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Allow varying structs to match between stages.
489ffc4d · Jamie Madill · 2857f489 · 489ffc4d · 489ffc4d · 489ffc4d
Commit 489ffc4d authored Feb 11, 2015 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 2 deletions

ParseContext.cpp src/compiler/translator/ParseContext.cpp +6 -1

Types.h src/compiler/translator/Types.h +0 -1

UtilsHLSL.cpp src/compiler/translator/UtilsHLSL.cpp +7 -0

No files found.
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -2545,7 +2545,12 @@ TPublicType TParseContext::addStructure(const TSourceLoc& structLine, const TSou
    TStructure* structure = new TStructure(structName, fieldList);
    TType* structureType = new TType(structure);

-    structure->setUniqueId(TSymbolTable::nextUniqueId());
+    // 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());
+    }

    if (!structName->empty())
    {

--- a/src/compiler/translator/Types.h
+++ b/src/compiler/translator/Types.h
@@ -134,7 +134,6 @@ class TStructure : public TFieldListCollection

    int uniqueId() const
    {
-        ASSERT(mUniqueId != 0);
        return mUniqueId;
    }


--- a/src/compiler/translator/UtilsHLSL.cpp
+++ b/src/compiler/translator/UtilsHLSL.cpp
@@ -175,6 +175,13 @@ 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();
 }