From: Chad Versace <chad.versace@intel.com>
Date: Wed, 17 Nov 2010 22:34:38 +0000 (-0800)
Subject: glsl: Fix linker bug in cross_validate_globals()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7528f143dfb77e3e0486006676e990964392aebf;p=mesa.git

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

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index cde70adff56..576b72a65fe 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);
       }