diff options
| author | Christian König <deathsimple@vodafone.de> | 2011-02-24 22:02:42 +0100 |
|---|---|---|
| committer | Christian König <deathsimple@vodafone.de> | 2011-02-24 22:02:42 +0100 |
| commit | b922a0ce12916a91cfc3e56714913fcf63279ff2 (patch) | |
| tree | e24fa039925220882d155ccb987f7914e83f4372 /src/gallium/auxiliary/SConscript | |
| parent | f013b4f8f1329982727691a55cc263e3011d02bf (diff) | |
| parent | c0ad70ae31ee5501281b434d56e389fc92b13a3a (diff) | |
| download | external_mesa3d-b922a0ce12916a91cfc3e56714913fcf63279ff2.zip external_mesa3d-b922a0ce12916a91cfc3e56714913fcf63279ff2.tar.gz external_mesa3d-b922a0ce12916a91cfc3e56714913fcf63279ff2.tar.bz2 | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
configure.ac
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_asm.h
src/gallium/drivers/r600/r600_shader.c
src/gallium/drivers/r600/r600_state_inlines.h
src/gallium/drivers/r600/r600_texture.c
Diffstat (limited to 'src/gallium/auxiliary/SConscript')
| -rw-r--r-- | src/gallium/auxiliary/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript index e6806d9..11024d4 100644 --- a/src/gallium/auxiliary/SConscript +++ b/src/gallium/auxiliary/SConscript @@ -190,11 +190,11 @@ source = [ 'util/u_tile.c', 'util/u_transfer.c', 'util/u_upload_mgr.c', + 'util/u_vbuf_mgr.c', 'vl/vl_bitstream_parser.c', 'vl/vl_mpeg12_mc_renderer.c', 'vl/vl_compositor.c', 'vl/vl_csc.c', - 'target-helpers/wrap_screen.c', ] if env['llvm']: |