summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2011-10-06 10:25:34 -0700
committerIan Romanick <[email protected]>2011-10-10 10:23:53 -0700
commit9f0e98d1dfcf83a07a62e9c62e3dc77336789b4a (patch)
tree98939738571250e4b07f735a5dfe2efe86ac53d2
parentf3650b05cf4e37066d0f142a4c14fcc650de8d8d (diff)
linker: Fix a slightly incorrect comment
Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r--src/glsl/linker.cpp5
1 files changed, 4 insertions, 1 deletions
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) {