commit 3ec304dba28dd43b8a19692439e220c15c6c58f8
author Luc Ferron <lucferron@chromium.org> Wed Apr 18 14:14:25 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Apr 20 11:42:17 2018 +0000
tree cc49ede8b4893b6f5b5f9e654c52368b54236dc3
parent b0f917fa634795ad10fce812bab31e71af1c767a

Vulkan: Support struct initializers in shaders

Also adds a new test in GLSLTest to validate the initialization of
a struct on the same line as its declaration.

Bug: angleproject:2459
Change-Id: Ib37e20378f8ec76541db26392663bcba03390756
Reviewed-on: https://chromium-review.googlesource.com/1017340
Commit-Queue: Luc Ferron <lucferron@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/OutputGLSLBase.cpp

diff --git a/src/compiler/translator/OutputGLSLBase.cpp b/src/compiler/translator/OutputGLSLBase.cpp
index fd1958c..14140eb 100644
--- a/src/compiler/translator/OutputGLSLBase.cpp
+++ b/src/compiler/translator/OutputGLSLBase.cpp
@@ -314,11 +314,6 @@
         const TStructure *structure = type.getStruct();
 
         declareStruct(structure);
-
-        if (structure->symbolType() != SymbolType::Empty)
-        {
-            mDeclaredStructs.insert(structure->uniqueId().get());
-        }
     }
     else if (type.getBasicType() == EbtInterfaceBlock)
     {
@@ -1180,6 +1175,11 @@
         out << ";\n";
     }
     out << "}";
+
+    if (structure->symbolType() != SymbolType::Empty)
+    {
+        mDeclaredStructs.insert(structure->uniqueId().get());
+    }
 }
 
 void TOutputGLSLBase::declareInterfaceBlockLayout(const TInterfaceBlock *interfaceBlock)