X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglsl%2Flinker.cpp;h=ac010cfbb6a84fa4230479402ce548807afc2038;hb=9a9a830b445b5dbd70a4155e0e5e8b896abfb868;hp=da5677067cdc86bb059184776b6af6631f05dee7;hpb=d4375fc0166a2ca50c4786ea93b5a5ccdbc8eaf7;p=mesa.git

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index da5677067cd..ac010cfbb6a 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -541,6 +541,25 @@ cross_validate_globals(struct gl_shader_program *prog,
 	       existing->explicit_location = true;
 	    }
 
+            /* From the GLSL 4.20 specification:
+             * "A link error will result if two compilation units in a program
+             *  specify different integer-constant bindings for the same
+             *  opaque-uniform name.  However, it is not an error to specify a
+             *  binding on some but not all declarations for the same name"
+             */
+            if (var->explicit_binding) {
+               if (existing->explicit_binding &&
+                   var->binding != existing->binding) {
+                  linker_error(prog, "explicit bindings for %s "
+                               "`%s' have differing values\n",
+                               mode_string(var), var->name);
+                  return false;
+               }
+
+               existing->binding = var->binding;
+               existing->explicit_binding = true;
+            }
+
 	    /* Validate layout qualifiers for gl_FragDepth.
 	     *
 	     * From the AMD/ARB_conservative_depth specs: