Translator: Fix struct/uniform separation w.r.t to arrays

src/compiler/translator/tree_ops/vulkan/SeparateStructFromUniformDeclarations.cpp

@@ -41,7 +41,7 @@ class Traverser : public TIntermTraverser
 
         if (type.isStructSpecifier() && type.getQualifier() == EvqUniform)
         {
-            doReplacement(decl, declarator, type.getStruct());
+            doReplacement(decl, declarator, type);
         }
 
         return false;
@@ -57,15 +57,13 @@ class Traverser : public TIntermTraverser
     }
 
   private:
-    void doReplacement(TIntermDeclaration *decl,
-                       TIntermTyped *declarator,
-                       const TStructure *oldStructure)
+    void doReplacement(TIntermDeclaration *decl, TIntermTyped *declarator, const TType &oldType)
     {
-        const TStructure *structure = oldStructure;
-        if (oldStructure->symbolType() == SymbolType::Empty)
+        const TStructure *structure = oldType.getStruct();
+        if (structure->symbolType() == SymbolType::Empty)
         {
             // Handle nameless structs: uniform struct { ... } variable;
-            structure = new TStructure(mSymbolTable, kEmptyImmutableString, &oldStructure->fields(),
+            structure = new TStructure(mSymbolTable, kEmptyImmutableString, &structure->fields(),
                                        SymbolType::AngleInternal);
         }
         TType *namedType = new TType(structure, true);
@@ -87,6 +85,7 @@ class Traverser : public TIntermTraverser
         TIntermDeclaration *namedDecl = new TIntermDeclaration;
         TType *uniformType            = new TType(structure, false);
         uniformType->setQualifier(EvqUniform);
+        uniformType->makeArrays(oldType.getArraySizes());
 
         TVariable *newVar        = new TVariable(mSymbolTable, asSymbol->getName(), uniformType,
                                           asSymbol->variable().symbolType());

src/tests/gl_tests/GLSLTest.cpp

@@ -10717,6 +10717,37 @@ void main() {
     EXPECT_NE(compileResult, 0);
 }
 
+// Regression test for transformation bug which separates struct declarations from uniform
+// declarations.  The bug was that the arrayness of the declaration was not being applied to the
+// replaced uniform variable.
+TEST_P(GLSLTest_ES31, UniformStructBug2)
+{
+    constexpr char kVS[] = R"(#version 310 es
+precision highp float;
+
+uniform struct Global
+{
+    float x;
+} u_global[2][3];
+
+void main() {
+  float y = u_global[0][0].x;
+
+  gl_Position = vec4(y);
+})";
+
+    GLuint shader = glCreateShader(GL_VERTEX_SHADER);
+
+    const char *sourceArray[1] = {kVS};
+    GLint lengths[1]           = {static_cast<GLint>(sizeof(kVS) - 1)};
+    glShaderSource(shader, 1, sourceArray, lengths);
+    glCompileShader(shader);
+
+    GLint compileResult;
+    glGetShaderiv(shader, GL_COMPILE_STATUS, &compileResult);
+    EXPECT_NE(compileResult, 0);
+}
+
 }  // anonymous namespace
 
 ANGLE_INSTANTIATE_TEST_ES2_AND_ES3(GLSLTest);