From: Timothy Arceri <t_arceri@yahoo.com.au>
Date: Mon, 15 Jun 2015 11:00:47 +0000 (+1000)
Subject: Revert "glsl: remove restriction on unsized arrays in GLSL ES 3.10"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=da6996485f2ca636218e3d83b53cf6a450bb9b38;p=mesa.git

Revert "glsl: remove restriction on unsized arrays in GLSL ES 3.10"

This reverts commit adee54f8269c5e9f4fde91d19f0e465afc8f14d8.

Further down in the GLSL ES 3.10 spec it say:

"If an array is declared as the last member of a shader storage block
and the size is not specified at compile-time, it is sized at run-time.
In all other cases, arrays are sized only at compile-time."

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
---

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index fc24305b244..259e01e0ca4 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -3943,15 +3943,7 @@ ast_declarator_list::hir(exec_list *instructions,
                           decl->identifier);
       }
 
-      /* GLSL ES 3.10 removes the restriction on unsized arrays.
-       *
-       * Section 4.1.9 (Arrays) of the GLSL ES 3.10 spec says:
-       *
-       *    "Variables of the same type can be aggregated into arrays by
-       *     declaring a name followed by brackets ([ ]) enclosing an
-       *     optional size."
-       */
-      if (state->es_shader && state->language_version < 310) {
+      if (state->es_shader) {
          const glsl_type *const t = (earlier == NULL)
             ? var->type : earlier->type;