glsl: Tidy stream handling in merge_qualifier().
authorKenneth Graunke <kenneth@whitecape.org>
Thu, 11 Aug 2016 18:44:09 +0000 (11:44 -0700)
committerKenneth Graunke <kenneth@whitecape.org>
Fri, 12 Aug 2016 06:56:48 +0000 (23:56 -0700)
commit0ed316360f6879d6e5179330d30e075e29f029e1
tree09ddbce16837cf949f85df9da6c05cfb62001fad
parentdffa371665fc45481f6b6686e586f9be2b36a915
glsl: Tidy stream handling in merge_qualifier().

The previous commit fixed xfb_buffer handling, which was largely copy
and pasted from the stream handling.  The difference is that stream
was set in input_layout_mask, so it worked.

However, that's totally rubbish: stream is only valid on geometry shader
outputs.  Presumably this was to hack around inout.  Instead, apply the
solution I used in the previous fix.

Really, we just need to separate shader interface and parameter
qualifier handling so this isn't a mess, but this patch at least
tidies it slightly.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
src/compiler/glsl/ast_type.cpp