diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-04-23 12:39:38 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-04-23 12:39:38 +1000 |
| commit | 104ff59585ad1888c8cef5ad9de0e2fdb3f48c21 (patch) | |
| tree | 9128984eef4a90cc6177d336759ce795b835d71f /src/mesa/state_tracker/st_atom_shader.c | |
| parent | b20acef90695d6e5975f538b6e9cb812b05f0cf6 (diff) | |
| parent | 6fc530ccda2971a5d99a955ad90ae9762238040f (diff) | |
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/state_tracker/st_atom_shader.c')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_shader.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c index ec39026eb3..3f5ec71112 100644 --- a/src/mesa/state_tracker/st_atom_shader.c +++ b/src/mesa/state_tracker/st_atom_shader.c @@ -273,8 +273,8 @@ update_linkage( struct st_context *st ) st->vp = stvp; st->fp = stfp; - st->pipe->bind_vs_state(st->pipe, stvp->driver_shader); - st->pipe->bind_fs_state(st->pipe, stfp->driver_shader); + cso_set_vertex_shader_handle(st->cso_context, stvp->driver_shader); + cso_set_fragment_shader_handle(st->cso_context, stfp->driver_shader); st->vertex_result_to_slot = xvp->output_to_slot; } |