[Mesa-dev] [PATCH 19/19] glsl: Allow arrays of arrays in GLSL ES 3.10 and GLSL 4.30

[Timothy Arceri]

On Sat, 2015-06-20 at 19:35 -0400, Ilia Mirkin wrote:
> On Sat, Jun 20, 2015 at 8:33 AM, Timothy Arceri <t_arceri at yahoo.com.au> wrote:
> > ---
> >  src/glsl/ast_to_hir.cpp       | 13 ++++++++-----
> >  src/glsl/glsl_parser.yy       | 22 ++++++++++++++--------
> >  src/glsl/glsl_parser_extras.h |  5 +++++
> >  3 files changed, 27 insertions(+), 13 deletions(-)
> >
> > diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
> > index 6d2dc2e..81b2765 100644
> > --- a/src/glsl/ast_to_hir.cpp
> > +++ b/src/glsl/ast_to_hir.cpp
> > @@ -1939,12 +1939,15 @@ process_array_type(YYLTYPE *loc, const glsl_type *base,
> >            *
> >            * "Only one-dimensional arrays may be declared."
> >            */
> > -         if (!state->ARB_arrays_of_arrays_enable) {
> > +         if (!state->has_arrays_of_arrays()) {
> > +            const char *const requirement = state->es_shader
> > +               ? "GLSL ES 310"
> > +               : "GL_ARB_arrays_of_array or GLSL 430";
> 
> I think everywhere I've seen it's GLSL ES 3.10 and GLSL 4.30. Also, it
> should be arrays_of_array*s*

Thanks for pointing out the missing 's' I'll fix that, however it seems
more common to use GLSL ES 310 and GLSL 430 see glsl_parser_extras.h. 

I could only find one instance of "GLSL 4.30" in glsl_parser.yy I
searched from 3.30-4.50