Apply array restriction on qualified types only on ESSL1.00

src/compiler/translator/ParseContext.cpp

@@ -1352,15 +1352,15 @@ TPublicType TParseContext::addFullySpecifiedType(TQualifier qualifier, bool inva
     returnType.invariant = invariant;
     returnType.layoutQualifier = layoutQualifier;
 
-    if (typeSpecifier.array)
-    {
-        error(typeSpecifier.line, "not supported", "first-class array");
-        recover();
-        returnType.clearArrayness();
-    }
-
     if (mShaderVersion < 300)
     {
+        if (typeSpecifier.array)
+        {
+            error(typeSpecifier.line, "not supported", "first-class array");
+            recover();
+            returnType.clearArrayness();
+        }
+
         if (qualifier == EvqAttribute && (typeSpecifier.type == EbtBool || typeSpecifier.type == EbtInt))
         {
             error(typeSpecifier.line, "cannot be bool or int", getQualifierString(qualifier));

src/tests/compiler_tests/MalformedShader_test.cpp

@@ -688,3 +688,20 @@ TEST_F(MalformedShaderTest, LayoutQualifierInFunctionReturnType)
         FAIL() << "Shader compilation succeeded, expecting failure " << mInfoLog;
     }
 }
+
+// Uniforms can be arrays (ESSL 3.00 section 4.3.5)
+TEST_F(MalformedShaderTest, UniformArray)
+{
+    const std::string &shaderString =
+        "#version 300 es\n"
+        "precision mediump float;\n"
+        "uniform vec4[2] u;\n"
+        "out vec4 my_FragColor;\n"
+        "void main() {\n"
+        "    my_FragColor = u[0];\n"
+        "}\n";
+    if (!compile(shaderString))
+    {
+        FAIL() << "Shader compilation failed, expecting success " << mInfoLog;
+    }
+}