summaryrefslogtreecommitdiff
path: root/src/mesa/state_tracker/st_atom_shader.c
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2008-02-12 16:10:11 -0700
committerBrian <brian.paul@tungstengraphics.com>2008-02-12 16:10:11 -0700
commit9677336845511be4852520d2e50f91f1df362f58 (patch)
tree08bbbb66729e1309fa3d201cfcb4526ee272190e /src/mesa/state_tracker/st_atom_shader.c
parent6d53b8f42349c507e7184aa567a4b2a4fc7b037f (diff)
gallium: rename st_fragment_program's fs field to cso to match st_vertex_program
Diffstat (limited to 'src/mesa/state_tracker/st_atom_shader.c')
-rw-r--r--src/mesa/state_tracker/st_atom_shader.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c
index 9196918509..2c6ec8421b 100644
--- a/src/mesa/state_tracker/st_atom_shader.c
+++ b/src/mesa/state_tracker/st_atom_shader.c
@@ -158,7 +158,7 @@ find_translated_vp(struct st_context *st,
/*
* Translate fragment program if needed.
*/
- if (!stfp->fs) {
+ if (!stfp->cso) {
GLuint inAttr, numIn = 0;
for (inAttr = 0; inAttr < FRAG_ATTRIB_MAX; inAttr++) {
@@ -179,7 +179,7 @@ find_translated_vp(struct st_context *st,
stfp->input_to_slot,
stfp->tokens,
ST_MAX_SHADER_TOKENS);
- assert(stfp->fs);
+ assert(stfp->cso);
}
@@ -227,7 +227,7 @@ find_translated_vp(struct st_context *st,
if (fpInAttrib >= 0) {
GLuint fpInSlot = stfp->input_to_slot[fpInAttrib];
if (fpInSlot != ~0) {
- GLuint vpOutSlot = stfp->fs->state.input_map[fpInSlot];
+ GLuint vpOutSlot = stfp->cso->state.input_map[fpInSlot];
xvp->output_to_slot[outAttr] = vpOutSlot;
numVpOuts++;
}
@@ -300,7 +300,7 @@ update_linkage( struct st_context *st )
st->pipe->bind_vs_state(st->pipe, st->state.vs->cso->data);
st->fp = stfp;
- st->state.fs = stfp->fs;
+ st->state.fs = stfp->cso;
st->pipe->bind_fs_state(st->pipe, st->state.fs->data);
st->vertex_result_to_slot = xvp->output_to_slot;