[Mesa-dev] [RFC PATCH 06/12] glsl: dont allow gl_PerVertex to be redeclared as an array of arrays

[Ilia Mirkin]

On Sat, Mar 21, 2015 at 11:00 PM, Timothy Arceri <t_arceri at yahoo.com.au> wrote:
> On Sat, 2015-03-21 at 19:34 -0400, Ilia Mirkin wrote:
>> On Sat, Mar 21, 2015 at 5:49 AM, Timothy Arceri <t_arceri at yahoo.com.au> wrote:
>> > Signed-off-by: Timothy Arceri <t_arceri at yahoo.com.au>
>> > ---
>> >  src/glsl/ast_to_hir.cpp | 6 +++++-
>> >  1 file changed, 5 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
>> > index 36f3eb7..7516e60 100644
>> > --- a/src/glsl/ast_to_hir.cpp
>> > +++ b/src/glsl/ast_to_hir.cpp
>> > @@ -5595,7 +5595,11 @@ ast_interface_block::hir(exec_list *instructions,
>> >                               _mesa_shader_stage_to_string(state->stage));
>> >           }
>> >           if (this->instance_name == NULL ||
>> > -             strcmp(this->instance_name, "gl_in") != 0 || this->array_specifier == NULL) {
>> > +             strcmp(this->instance_name, "gl_in") != 0 || this->array_specifier == NULL ||
>> > +             (this->array_specifier->is_unsized_array &&
>> > +              !this->array_specifier->array_dimensions.is_empty()) ||
>>
>> Don't know a lot about AST, but does it make sense to have
>> ->is_unsized_array && array_dimensions? When would that be true?
>> Shouldn't this just be !dim.empty() without the is_unsized_array
>> check?
>
> ast is a pain to work with. I don't recall why I wrote it that way but
> it should be easy to check as it was done so the piglit tests would
> pass. I will take another look and see if I can rework it to be a little
> cleaner. Otherwise I might just drop this patch for now.
>

Please do, but I think that you do need the modification... just not
the ->is_unsized_array bit of it. I think you want something like

|| !is_empty || !is_tail

Basically you don't want gl_in[5], nor gl_in[5][] nor gl_in[][5] nor
gl_in[][]. Right?