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:
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.arc...@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.ja...@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 > -- > 2.4.3 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
