Checkpoint: new vertex/fragment attribute naming

Replace VF_ATTRIB_x with TGSI_ATTRIB_x
When converting mesa programs to TGSI programs, also convert the InputsRead
and OutputsWritten to a mask of TGSI_ATTRIB_ bits.
Still need to do conversion for vertex programs...

2 files changed, 6 insertions, 3 deletions

diff --git a/src/mesa/state_tracker/st_atom_fs.c b/src/mesa/state_tracker/st_atom_fs.c
index 019b6457e09..a34a227ac04 100644
--- a/src/mesa/state_tracker/st_atom_fs.c
+++ b/src/mesa/state_tracker/st_atom_fs.c
@@ -110,8 +110,10 @@ static void update_fs( struct st_context *st )
 
    /* update pipe state */
    memset( &fs, 0, sizeof(fs) );
-   fs.inputs_read = fp->Base.Base.InputsRead;
-   fs.outputs_written = fp->Base.Base.OutputsWritten;
+   fs.inputs_read
+      = tgsi_mesa_translate_fragment_input_mask(fp->Base.Base.InputsRead);
+   fs.outputs_written
+      = tgsi_mesa_translate_fragment_output_mask(fp->Base.Base.OutputsWritten);
    fs.tokens = &fp->tokens[0];
 
    if (memcmp(&fs, &st->state.fs, sizeof(fs)) != 0 ||
diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c
index e3690deb5ae..69b985e4055 100644
--- a/src/mesa/state_tracker/st_cb_clear.c
+++ b/src/mesa/state_tracker/st_cb_clear.c
@@ -348,7 +348,8 @@ clear_with_quad(GLcontext *ctx,
          stfp = make_color_shader(st);
       }
       memset(&fs, 0, sizeof(fs));
-      fs.inputs_read = stfp->Base.Base.InputsRead;
+      fs.inputs_read = tgsi_mesa_translate_fragment_input_mask(stfp->Base.Base.InputsRead);
+      fs.outputs_written = tgsi_mesa_translate_fragment_output_mask(stfp->Base.Base.OutputsWritten);
       fs.tokens = &stfp->tokens[0];
       pipe->set_fs_state(pipe, &fs);
    }