[Mesa-dev] [PATCH] glsl: add missing explicit_image_format flag to has_layout()

[Timothy Arceri]

On Wed, 2016-01-20 at 10:51 -0800, Ian Romanick wrote:
> On 01/19/2016 04:28 PM, Mark Janes wrote:
> > This patch fixes
> > arb_shader_image_load_store.compiler.declaration-format-qualifier
> > -duplicate
> > tests.  However, it regresses 17 other arb_shader_image_load_store
> > other
> > tests with:
> 
> Which tests?  As Timothy says, the tests may be incorrect.  Rules
> about
> the ordering of qualifiers changed a few times over the years.

I've fixed up the regression when appying this patch.

http://cgit.freedesktop.org/piglit/commit/?id=e792463a99ffe6336a620a6a9
8131c3b14748403

> 
> > Failed to compile fragment shader: 0:20(1): error: storage
> > qualifiers must come after precise, invariant, interpolation,
> > layout and auxiliary storage qualifiers
> > 
> > -Mark
> > 
> > Timothy Arceri <timothy.arceri at collabora.com> writes:
> > 
> > > Fixes piglit regression after fixes to duplicate layout rules.
> > > 
> > > Previously catching multiple layouts was relying on the code
> > > meant to catch duplicates within a single layout(...), this
> > > change triggers the rules for multiple layouts.
> > > 
> > > Cc: Mark Janes <mark.a.janes at intel.com>
> > > ---
> > >  src/glsl/ast_type.cpp | 1 +
> > >  1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
> > > index cf494d9..e0e3311 100644
> > > --- a/src/glsl/ast_type.cpp
> > > +++ b/src/glsl/ast_type.cpp
> > > @@ -74,6 +74,7 @@ ast_type_qualifier::has_layout() const
> > >            || this->flags.q.row_major
> > >            || this->flags.q.packed
> > >            || this->flags.q.explicit_location
> > > +          || this->flags.q.explicit_image_format
> > >            || this->flags.q.explicit_index
> > >            || this->flags.q.explicit_binding
> > >            || this->flags.q.explicit_offset