Merge commit 'origin/gallium-draw-retval'
authorKeith Whitwell <keithw@vmware.com>
Tue, 5 Jan 2010 14:13:40 +0000 (14:13 +0000)
committerKeith Whitwell <keithw@vmware.com>
Tue, 5 Jan 2010 14:13:40 +0000 (14:13 +0000)
commitc727fa6dbf5a9fca5fc94de06c309f54402449d1
treed6e721f1dff0ccaf3666756c80a80e7c6d3dec32
parentc91ceeec320daebe7d9d78ed2d80a2265bcfa8c2
parente3be32ccf900f22c1f75c9f2d8842fe9630da7d9
Merge commit 'origin/gallium-draw-retval'

Conflicts:
src/gallium/drivers/identity/id_context.c
19 files changed:
src/gallium/drivers/cell/ppu/cell_draw_arrays.c
src/gallium/drivers/i915/i915_context.c
src/gallium/drivers/identity/id_context.c
src/gallium/drivers/llvmpipe/lp_draw_arrays.c
src/gallium/drivers/llvmpipe/lp_state.h
src/gallium/drivers/nv04/nv04_vbo.c
src/gallium/drivers/nv10/nv10_vbo.c
src/gallium/drivers/nv20/nv20_vbo.c
src/gallium/drivers/nv30/nv30_context.h
src/gallium/drivers/nv30/nv30_vbo.c
src/gallium/drivers/nv40/nv40_context.h
src/gallium/drivers/nv40/nv40_draw.c
src/gallium/drivers/nv40/nv40_vbo.c
src/gallium/drivers/nv50/nv50_vbo.c
src/gallium/drivers/r300/r300_render.c
src/gallium/drivers/softpipe/sp_draw_arrays.c
src/gallium/drivers/softpipe/sp_state.h
src/gallium/drivers/trace/tr_context.c
src/gallium/include/pipe/p_context.h