[Mesa-dev] [PATCH 2.5/3] glsl: only apply default stream to output blocks

[Timothy Arceri]

On Fri, 2016-02-26 at 07:41 +0100, Samuel Iglesias Gonsálvez wrote:
> 
> 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 <siglesias at 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?

Sure.

> 
> >  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 <siglesias at 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.

Right that should happen once patch 3 lands. It should catch all
invalid input qualifiers. The only limitation is using it for function
params too at this point, but its a good first step IMO. I hope to fix
up some small issues with my component qualifier series in the next
couple of days so I can finally land this and some other fixes.

Thanks for the reviews.

> 
> Sam
> 
> >        /* Assign global layout's stream value. */
> >        block->layout.flags.q.stream = 1;
> >        block->layout.flags.q.explicit_stream = 0;
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev