Arrays are not allowed as vertex shader inputs in GLSL 1.30 either

diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp
index dd024836a0e79833e8f2c4cbdc7a305edd289ab9..a5fa5e112f671b5d8be75f4c7e76f57e2f71e7aa 100644 (file)
--- a/ast_to_hir.cpp
+++ b/ast_to_hir.cpp
@@ -1155,6 +1155,12 @@ ast_declarator_list::hir(exec_list *instructions,
             *    vectors. Vertex shader inputs can also form arrays of these
             *    types, but not structures."
             *
+            * From page 31 (page 27 of the PDF) of the GLSL 1.30 spec:
+            *
+            *    "Vertex shader inputs can only be float, floating-point
+            *    vectors, matrices, signed and unsigned integers and integer
+            *    vectors. They cannot be arrays or structures."
+            *
             * From page 23 (page 29 of the PDF) of the GLSL 1.20 spec:
             *
             *    "The attribute qualifier can be used only with float,
@@ -1181,7 +1187,7 @@ ast_declarator_list::hir(exec_list *instructions,
               error_emitted = true;
            }
 
-           if (!error_emitted && (state->language_version <= 120)
+           if (!error_emitted && (state->language_version <= 130)
                && var->type->is_array()) {
               _mesa_glsl_error(& loc, state,
                                "vertex shader input / attribute cannot have "

diff --git a/tests/attribute-11.glsl b/tests/attribute-11.glsl
index c1e6901431480c811fa41a5499bc8ce507fdeaa8..47cb5a05833c5784ce7788aeeb6bd375b0caa68c 100644 (file)
--- a/tests/attribute-11.glsl
+++ b/tests/attribute-11.glsl
@@ -1,5 +1,5 @@
 #version 130
-/* PASS */
+/* FAIL - attribute cannot have array type in GLSL 1.30 */
 attribute vec4 i[10];
 
 void main()