Merge remote branch 'origin/gallium-0.1' into nouveau-gallium-0.1

1 files changed, 6 insertions, 0 deletions

diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index c25c668329..59314a3232 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -187,6 +187,12 @@ st_translate_vertex_program(struct st_context *st,
       if (stvp->Base.Base.OutputsWritten & (1 << attr)) {
          GLuint slot;
 
+         /* XXX
+          * Pass in the fragment program's input's semantic info.
+          * Use the generic semantic indexes from there, instead of
+          * guessing below.
+          */
+
          if (outputMapping) {
             slot = outputMapping[attr];
             assert(slot != ~0);