summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Versace <chad.versace@intel.com>2011-01-10 15:29:30 -0800
committerIan Romanick <ian.d.romanick@intel.com>2011-01-19 10:42:38 -0800
commit5f9c50053cb83180a51313ed9130d0e36db5642c (patch)
tree27d0dfeeda4440bffa1d98b13ff90957eaf664ac
parent77579801392c23d6fa425982dd8fa7cbdec2ca2e (diff)
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)
-rw-r--r--src/glsl/linker.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 440a9135f28..d6b323ceee3 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -409,6 +409,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->name, var);
}