diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2009-11-26 01:15:25 +0100 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2009-11-26 01:15:25 +0100 |
| commit | 4dcdf3b9c67f1481d46c1decba84c9c55698db4c (patch) | |
| tree | 7d43399738dd38344b511971891f349178a6f52d /src/mesa/state_tracker/st_atom.c | |
| parent | 9e3728c858e0f84b05a24f858f6aeba53fa4e7cb (diff) | |
| parent | 07fafc7c9346aa260829603bf3188596481e9e62 (diff) | |
Merge commit 'origin/st-shader-varients'
Conflicts:
src/mesa/state_tracker/st_atom_shader.c
src/mesa/state_tracker/st_program.c
Diffstat (limited to 'src/mesa/state_tracker/st_atom.c')
| -rw-r--r-- | src/mesa/state_tracker/st_atom.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_atom.c b/src/mesa/state_tracker/st_atom.c index 0e89a624c4..73df44d198 100644 --- a/src/mesa/state_tracker/st_atom.c +++ b/src/mesa/state_tracker/st_atom.c @@ -46,7 +46,8 @@ static const struct st_tracked_state *atoms[] = &st_update_clip, &st_finalize_textures, - &st_update_shader, + &st_update_fp, + &st_update_vp, &st_update_rasterizer, &st_update_polygon_stipple, |