Merge branch 'gallium-embedded'
authorJosé Fonseca <jfonseca@vmware.com>
Wed, 3 Feb 2010 18:54:13 +0000 (18:54 +0000)
committerJosé Fonseca <jfonseca@vmware.com>
Wed, 3 Feb 2010 18:54:13 +0000 (18:54 +0000)
commit45dac0d82a5a69166e86dce77c2550f7512c541e
tree41a10f422174ef9543db2396057f052c056eb396
parentf8d824e09a54871df899f368ebaadc9a4e5b62ff
parent976afaf98f4b1ce32003dd014cbb3c09063bcb68
Merge branch 'gallium-embedded'
12 files changed:
src/gallium/auxiliary/draw/draw_pipe_aaline.c
src/gallium/auxiliary/draw/draw_pipe_pstipple.c
src/gallium/auxiliary/tgsi/tgsi_ureg.c
src/gallium/auxiliary/tgsi/tgsi_ureg.h
src/gallium/drivers/svga/svga_context.c
src/gallium/drivers/svga/svga_state_fs.c
src/gallium/state_trackers/vega/shaders_cache.c
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_cb_drawpixels.c
src/mesa/state_tracker/st_cb_strings.c
src/mesa/state_tracker/st_cb_texture.c
src/mesa/state_tracker/st_framebuffer.c