Mesa (master): linker: Fix a slightly incorrect comment
Ian Romanick
idr at kemper.freedesktop.org
Mon Oct 10 17:24:27 UTC 2011
Module: Mesa
Branch: master
Commit: 9f0e98d1dfcf83a07a62e9c62e3dc77336789b4a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9f0e98d1dfcf83a07a62e9c62e3dc77336789b4a
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Thu Oct 6 10:25:34 2011 -0700
linker: Fix a slightly incorrect comment
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/glsl/linker.cpp | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 9463f53..42075cb 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) {
More information about the mesa-commit
mailing list