From: Tapani Pälli <tapani.palli@intel.com>
Date: Tue, 9 Jun 2015 08:06:56 +0000 (+0300)
Subject: glsl: remove cross validation of interpolation qualifier with GLSL 4.40
X-Git-Tag: upstream/17.1.0~18057
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32a220f1f60980de50ecefb3b9ab1f754ade8c83;p=platform%2Fupstream%2Fmesa.git

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>
---

diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp
index 278a778..020842a 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, "