Mesa (7.10): glsl: At link-time, check that globals have matching centroid qualifiers

[Ian Romanick]

Module: Mesa
Branch: 7.10
Commit: 45be27d09b0e581f376de02b1c12a63e17387f7c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=45be27d09b0e581f376de02b1c12a63e17387f7c

Author: Chad Versace <chad.versace at intel.com>
Date:   Mon Jan 10 15:29:30 2011 -0800

glsl: At link-time, check that globals have matching centroid qualifiers

Fixes bug 31923: http://bugs.freedesktop.org/show_bug.cgi?id=31923
(cherry picked from commit 61428dd2ab66017f80dc4f3b0793e741d93a6d47)

---

 src/glsl/linker.cpp |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index d8c42ac..c906d74 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -422,6 +422,12 @@ cross_validate_globals(struct gl_shader_program *prog,
 	                           mode_string(var), var->name);
 	       return false;
 	    }
+            if (existing->centroid != var->centroid) {
+               linker_error_printf(prog, "declarations for %s `%s' have "
+                                   "mismatching centroid qualifiers\n",
+                                   mode_string(var), var->name);
+               return false;
+            }
 	 } else
 	    variables.add_variable(var);
       }