From: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu, 6 Oct 2011 17:25:34 +0000 (-0700)
Subject: linker: Fix a slightly incorrect comment
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9f0e98d1dfcf83a07a62e9c62e3dc77336789b4a;p=mesa.git

linker: Fix a slightly incorrect comment

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 9463f53055e..42075cbbe09 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -1342,7 +1342,10 @@ assign_attribute_or_color_locations(gl_shader_program *prog,
 	 }
       }
 
-      /* The location was explicitly assigned, nothing to do here.
+      /* If the variable is not a built-in and has a location statically
+       * assigned in the shader (presumably via a layout qualifier), make sure
+       * that it doesn't collide with other assigned locations.  Otherwise,
+       * add it to the list of variables that need linker-assigned locations.
        */
       const unsigned slots = count_attribute_slots(var->type);
       if (var->location != -1) {