[Mesa-dev] [PATCH] Revert "glsl: remove restriction on unsized arrays in GLSL ES 3.10"

[Samuel Iglesias Gonsálvez]

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

Sam

On 15/06/15 13:06, Timothy Arceri wrote:
> 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."
> ---
> 
>  Not sure if I needed to sent this to the list since I wrote the
>  initial patch.
> 
>  src/glsl/ast_to_hir.cpp | 10 +---------
>  1 file changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
> index fc24305..259e01e 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;
>  
>