inout variables have q.in and q.out set. We were trying to set xfb_buffer = 1 for shader output variables (and inadvertantly setting it on inout parameters, too). But input_layout_mask doesn't have xfb_buffer set, so it was seen as in invalid input qualifier. This meant that all 'inout' parameters were broken. Caught by running a WebGL conformance test in Chromium: https://www.khronos.org/registry/webgl/sdk/tests/deqp/data/gles3/shaders/qualification_order.html?webglVersion=2 Fixes Piglit's tests/spec/glsl-4.40/compiler/inout-parameter-qualifier. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>tags/13.0-branchpoint
@@ -242,7 +242,8 @@ ast_type_qualifier::merge_qualifier(YYLTYPE *loc, | |||
if (q.flags.q.xfb_buffer) { | |||
this->flags.q.xfb_buffer = 1; | |||
this->xfb_buffer = q.xfb_buffer; | |||
} else if (!this->flags.q.xfb_buffer && this->flags.q.out) { | |||
} else if (!this->flags.q.xfb_buffer && this->flags.q.out && | |||
!this->flags.q.in) { | |||
/* Assign global xfb_buffer value */ | |||
this->flags.q.xfb_buffer = 1; | |||
this->xfb_buffer = state->out_qualifier->xfb_buffer; |