Merge branch 'master' into gallium-texture-transfer
authorKeith Whitwell <keithw@vmware.com>
Mon, 16 Feb 2009 19:50:48 +0000 (19:50 +0000)
committerKeith Whitwell <keithw@vmware.com>
Mon, 16 Feb 2009 19:50:48 +0000 (19:50 +0000)
commit59d54334c96f44ed1d8bf660dc96221362a77d04
treee9ab34e568256bcdc2a88602c47072ab769211e8
parent7c8836e9ef49d938aa55a1c385b95c6371c301f1
parentc5c383596ddb26cd75e4b355918ad16915283b59
Merge branch 'master' into gallium-texture-transfer

Conflicts:

src/mesa/state_tracker/st_cb_accum.c
src/mesa/state_tracker/st_cb_drawpixels.c
src/gallium/auxiliary/draw/draw_pipe_pstipple.c
src/gallium/drivers/softpipe/sp_draw_arrays.c
src/gallium/drivers/softpipe/sp_texture.c
src/gallium/include/pipe/p_screen.h
src/gallium/include/pipe/p_state.h
src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c
src/mesa/state_tracker/st_cb_accum.c
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_cb_drawpixels.c
src/mesa/state_tracker/st_cb_fbo.c
src/mesa/state_tracker/st_cb_texture.c