Fix nameless struct handling.

BUG=401296 The addition of layout qualifier handling in es3 development inadvertently broke handling of nameless structs. Change-Id: I805bab7a981d1f7f6227ae043720296fc3454662 Reviewed-on: https://chromium-review.googlesource.com/211860Reviewed-by: Zhenyao Mo <zmo@chromium.org> Tested-by: Shannon Woods <shannonwoods@chromium.org>

Fix nameless struct handling.
bc75f36b · Shannon Woods · 6f4423af · bc75f36b
Commit bc75f36b authored Aug 11, 2014 by Shannon Woods
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

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

No files found.
--- a/src/compiler/translator/UniformHLSL.cpp
+++ b/src/compiler/translator/UniformHLSL.cpp
@@ -137,7 +137,12 @@ TString UniformHLSL::uniformsHeader(ShShaderOutput outputType, const ReferencedS
        else
        {
            const TStructure *structure = type.getStruct();
-            const TString &typeName = (structure ? QualifiedStructNameString(*structure, false, false) : TypeString(type));
+            // If this is a nameless struct, we need to use its full definition, rather than its (empty) name.
+            // TypeString() will invoke defineNameless in this case, but layout qualifiers will not be taken into
+            // account in this case.
+            // TODO: handle nameless structs with layout qualifiers.
+            const TString &typeName = ((structure && !structure->name().empty()) ?
+                                        QualifiedStructNameString(*structure, false, false) : TypeString(type));

            const TString &registerString = TString("register(") + UniformRegisterPrefix(type) + str(registerIndex) + ")";