diff options
| author | Michal Krol <michal@vmware.com> | 2010-03-02 13:35:30 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2010-03-02 13:35:30 +0100 |
| commit | 4ca70c489baed3e23dbf5e5e5794385113e22252 (patch) | |
| tree | c2fb1cc4f46e2ffe2c84ce4680fc68fed29f02de /src/mesa/state_tracker/st_atom_clip.c | |
| parent | c1c7fa5192c4fb3f51fb67c81e58713d61ff0c93 (diff) | |
| parent | ff9ddf4d39be9e36d3e1dd9e10e889efa40dfb1e (diff) | |
Merge branch 'gallium-no-rhw-position'
Conflicts:
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state_derived.c
Diffstat (limited to 'src/mesa/state_tracker/st_atom_clip.c')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_clip.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_atom_clip.c b/src/mesa/state_tracker/st_atom_clip.c index 23d709b814..80c0e92139 100644 --- a/src/mesa/state_tracker/st_atom_clip.c +++ b/src/mesa/state_tracker/st_atom_clip.c @@ -35,6 +35,8 @@ #include "pipe/p_context.h" #include "st_atom.h" +#include "cso_cache/cso_context.h" + /* Second state atom for user clip planes: */ @@ -56,7 +58,7 @@ static void update_clip( struct st_context *st ) if (memcmp(&clip, &st->state.clip, sizeof(clip)) != 0) { st->state.clip = clip; - st->pipe->set_clip_state(st->pipe, &clip); + cso_set_clip(st->cso_context, &clip); } } |