diff options
| author | Roland Scheidegger <[email protected]> | 2010-05-21 20:02:22 +0200 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2010-05-21 20:02:22 +0200 |
| commit | 3293bcdc80cdfa20a2381aae2b94505bdf95d857 (patch) | |
| tree | 16ab1ae66010f6d8b1325dbfa9006126a8e95771 /src/mesa/SConscript | |
| parent | 8504c5d931e47765a15fdaec2df2cb6502a1bd5c (diff) | |
| parent | ce65caba846b03b5ef4144e311b85cfd48ab9bbb (diff) | |
Merge branch 'gallium-msaa'
Conflicts:
src/mesa/state_tracker/st_gen_mipmap.c
src/mesa/state_tracker/st_texture.c
Diffstat (limited to 'src/mesa/SConscript')
| -rw-r--r-- | src/mesa/SConscript | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 9408e2d2f69..b553804fcdc 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -151,6 +151,7 @@ if env['platform'] != 'winddk': 'state_tracker/st_atom_constbuf.c', 'state_tracker/st_atom_depth.c', 'state_tracker/st_atom_framebuffer.c', + 'state_tracker/st_atom_msaa.c', 'state_tracker/st_atom_pixeltransfer.c', 'state_tracker/st_atom_sampler.c', 'state_tracker/st_atom_scissor.c', |