On Fri, Feb 26, 2016 at 11:51:16AM +1100, Timothy Arceri wrote: > This is needed to allow invalid qualifier checks on inputs. > > Cc: Samuel Iglesias Gonsálvez <sigles...@igalia.com> > --- > I missed this in the first series as no tests hit this, I guess that means > we have no gs tests that have an input block with a layout qualifier :( >
Yes, you are right. Would you mind adding one test for this case? > Transform feedback qualifiers I'm adding do a similar thing and I was > hitting this problem with them. > > src/compiler/glsl/glsl_parser_extras.cpp | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/src/compiler/glsl/glsl_parser_extras.cpp > b/src/compiler/glsl/glsl_parser_extras.cpp > index ec180c0..2b1cc0d 100644 > --- a/src/compiler/glsl/glsl_parser_extras.cpp > +++ b/src/compiler/glsl/glsl_parser_extras.cpp > @@ -922,7 +922,8 @@ _mesa_ast_process_interface_block(YYLTYPE *locp, > block->layout.flags.i |= block_interface_qualifier; > > if (state->stage == MESA_SHADER_GEOMETRY && > - state->has_explicit_attrib_stream()) { > + state->has_explicit_attrib_stream() && > + block->layout.flags.q.out) { Reviewed-by: Samuel Iglesias Gonsálvez <sigles...@igalia.com> I am thinking that we need to return a compiler error when setting stream qualifier to an input block as glslangValidator does but in a different patch... If you are busy, I can write it later today. Just let me know. Sam > /* Assign global layout's stream value. */ > block->layout.flags.q.stream = 1; > block->layout.flags.q.explicit_stream = 0; > -- > 2.5.0 > >
signature.asc
Description: PGP signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev