Upstream version 9.37.197.0

[platform/framework/web/crosswalk.git] / src / third_party / angle / src / compiler / translator / OutputHLSL.cpp

diff --git a/src/third_party/angle/src/compiler/translator/OutputHLSL.cpp b/src/third_party/angle/src/compiler/translator/OutputHLSL.cpp
index 5520c86..5cc2c14 100644 (file)
--- a/src/third_party/angle/src/compiler/translator/OutputHLSL.cpp
+++ b/src/third_party/angle/src/compiler/translator/OutputHLSL.cpp
@@ -582,7 +582,11 @@ void OutputHLSL::header()
         else
         {
             const TStructure *structure = type.getStruct();
-            const TString &typeName = (structure ? structureTypeName(*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, if relevant, will not
+            // be taken into account.
+            const TString &typeName = ((structure && !structure->name().empty()) ?
+                                        structureTypeName(*structure, false, false) : typeString(type));
 
             const TString &registerString = TString("register(") + RegisterPrefix(type) + str(registerIndex) + ")";