diff options
| author | Tapani Pälli <tapani.palli@intel.com> | 2015-06-09 11:06:56 +0300 |
|---|---|---|
| committer | Tapani Pälli <tapani.palli@intel.com> | 2015-06-24 10:06:32 +0300 |
| commit | 32a220f1f60980de50ecefb3b9ab1f754ade8c83 (patch) | |
| tree | 86cfefe5e0cce0b12616a1480cea86ae38a30241 | |
| parent | 23132cd13baa7b3e9688a118466261a282594b8e (diff) | |
glsl: remove cross validation of interpolation qualifier with GLSL 4.40
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
| -rw-r--r-- | src/glsl/link_varyings.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp index 278a778797..020842a54a 100644 --- a/src/glsl/link_varyings.cpp +++ b/src/glsl/link_varyings.cpp @@ -128,7 +128,17 @@ cross_validate_types_and_qualifiers(struct gl_shader_program *prog, return; } - if (input->data.interpolation != output->data.interpolation) { + /* GLSL >= 4.40 removes text requiring interpolation qualifiers + * to match cross stage, they must only match within the same stage. + * + * From page 84 (page 90 of the PDF) of the GLSL 4.40 spec: + * + * "It is a link-time error if, within the same stage, the interpolation + * qualifiers of variables of the same name do not match. + * + */ + if (input->data.interpolation != output->data.interpolation && + prog->Version < 440) { linker_error(prog, "%s shader output `%s' specifies %s " "interpolation qualifier, " |