diff options
| author | Chad Versace <chad.versace@intel.com> | 2010-11-17 14:34:38 -0800 |
|---|---|---|
| committer | Chad Versace <chad.versace@intel.com> | 2010-12-01 20:40:07 -0800 |
| commit | 7528f143dfb77e3e0486006676e990964392aebf (patch) | |
| tree | c17b6cdc1707f7276a621498d2f68f44e8ccb164 /src/glsl/linker.cpp | |
| parent | 4c7001462607e6e99e474d6271dd481d3f8f201c (diff) | |
glsl: Fix linker bug in cross_validate_globals()
Cause linking to fail if a global has mismatching invariant qualifiers.
See https://bugs.freedesktop.org/show_bug.cgi?id=30261
Diffstat (limited to 'src/glsl/linker.cpp')
| -rw-r--r-- | src/glsl/linker.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index cde70adff5..576b72a65f 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -411,6 +411,13 @@ cross_validate_globals(struct gl_shader_program *prog, existing->constant_value = var->constant_value->clone(talloc_parent(existing), NULL); } + + if (existing->invariant != var->invariant) { + linker_error_printf(prog, "declarations for %s `%s' have " + "mismatching invariant qualifiers\n", + mode_string(var), var->name); + return false; + } } else variables.add_variable(var); } |