From b87370c4ec108b85bfb1f9d83e935bcf87603028 Mon Sep 17 00:00:00 2001 From: Chad Versace Reply-To: Chad Versace Date: Wed, 17 Nov 2010 14:34:38 -0800 Subject: [PATCH] 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 --- 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 616ec78..e81aed7 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->name, var); } -- 1.7.1