diff options
| author | Ben Skeggs <[email protected]> | 2008-05-27 00:59:41 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-05-27 00:59:41 +1000 |
| commit | 0f9635d9d522ea712724415599ceb44d53e67819 (patch) | |
| tree | 91484d00053baeb265d04a54a116229562194217 /src/mesa/state_tracker/st_atom.c | |
| parent | 8f67f98959261d193cb5f3db274b55fb24e2bb1e (diff) | |
| parent | 253066d716e3039522eeb7b072811cccd89b4a82 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
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 18063adc79c..ecfd1179189 100644 --- a/src/mesa/state_tracker/st_atom.c +++ b/src/mesa/state_tracker/st_atom.c @@ -45,10 +45,10 @@ */ static const struct st_tracked_state *atoms[] = { - &st_update_framebuffer, &st_update_depth_stencil_alpha, &st_update_clip, + &st_finalize_textures, &st_update_shader, &st_update_rasterizer, @@ -58,6 +58,7 @@ static const struct st_tracked_state *atoms[] = &st_update_blend, &st_update_sampler, &st_update_texture, + &st_update_framebuffer, &st_update_vs_constants, &st_update_fs_constants, &st_update_pixel_transfer |