Checkpoint: rework shader input/output register mapping.

This is a step toward removing TGSI_ATTRIB_ tokens.
Basically, when translating Mesa programs to TGSI programs, pass in input and
output register re-maps, plus interpolation info.
There's some known breakage (cubemap.c) so more to be done...

1 files changed, 12 insertions, 5 deletions

diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index a2f114b1ba..68ceba4d78 100644
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -61,13 +61,20 @@ struct st_fragment_program
 
 struct st_vertex_program
 {
-   struct gl_vertex_program Base;
-   GLboolean error;             /* If program is malformed for any reason. */
+   struct gl_vertex_program Base;  /**< The Mesa vertex program */
+   GLboolean error;        /**< Set if program is malformed for any reason. */
 
-   GLuint    id;		/* String id, for tracking
-				 * ProgramStringNotify changes.
-				 */
+   GLuint    id; /**< String id, for tracking ProgramStringNotify changes. */
+
+   /** maps a Mesa VERT_ATTRIB_x to a packed TGSI input index */
+   GLuint input_to_index[MAX_VERTEX_PROGRAM_ATTRIBS];
+   /** maps a TGSI input index back to a Mesa VERT_ATTRIB_x */
+   GLuint index_to_input[MAX_VERTEX_PROGRAM_ATTRIBS];
+
+   GLuint output_to_index[MAX_VERTEX_PROGRAM_ATTRIBS];
+   GLuint index_to_output[MAX_VERTEX_PROGRAM_ATTRIBS];
 
+   /** The program in TGSI format */
    struct tgsi_token tokens[ST_FP_MAX_TOKENS];
    GLboolean dirty;