diff options
author | Timothy Arceri <timothy.arceri@collabora.com> | 2016-01-18 20:46:29 +1100 |
---|---|---|
committer | Timothy Arceri <timothy.arceri@collabora.com> | 2016-03-31 12:50:04 +1100 |
commit | 7b407fececeb0e0bcc0e54929db3ef6809655632 (patch) | |
tree | b9abe34df55ca4e5b9d3c278db85053871b742f5 /src/compiler/glsl/glsl_parser_extras.cpp | |
parent | c9afd94af6fa129370eb001077724a77093ecd5a (diff) | |
download | external_mesa3d-7b407fececeb0e0bcc0e54929db3ef6809655632.zip external_mesa3d-7b407fececeb0e0bcc0e54929db3ef6809655632.tar.gz external_mesa3d-7b407fececeb0e0bcc0e54929db3ef6809655632.tar.bz2 |
glsl: relax stage restrictions on layout defaults for outputs
The new xfb_buffer and xfb_stride global qualifiers are allowed in
geom, tess and vertex stages.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/compiler/glsl/glsl_parser_extras.cpp')
-rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index 76ae0f8..b88b622 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -1595,13 +1595,12 @@ set_shader_inout_layout(struct gl_shader *shader, struct _mesa_glsl_parse_state *state) { /* Should have been prevented by the parser. */ - if (shader->Stage == MESA_SHADER_TESS_CTRL) { + if (shader->Stage == MESA_SHADER_TESS_CTRL || + shader->Stage == MESA_SHADER_VERTEX) { assert(!state->in_qualifier->flags.i); - } else if (shader->Stage == MESA_SHADER_TESS_EVAL) { - assert(!state->out_qualifier->flags.i); - } else if (shader->Stage != MESA_SHADER_GEOMETRY) { + } else if (shader->Stage != MESA_SHADER_GEOMETRY && + shader->Stage != MESA_SHADER_TESS_EVAL) { assert(!state->in_qualifier->flags.i); - assert(!state->out_qualifier->flags.i); } if (shader->Stage != MESA_SHADER_COMPUTE) { |