Merge branch 'gallium-noconstbuf'
authorRoland Scheidegger <sroland@vmware.com>
Fri, 15 Jan 2010 17:09:45 +0000 (18:09 +0100)
committerRoland Scheidegger <sroland@vmware.com>
Fri, 15 Jan 2010 17:09:45 +0000 (18:09 +0100)
commit5e5d0ad08167c178fcda005862e3dbead3e8c482
treef08d0cf2725fede62ada26e8815d6d9eeebdf337
parent1c4ad778126788cebcb54342837042bfe432d504
parent70c8d2a29724d018bacc4a68ddc61db08faea00d
Merge branch 'gallium-noconstbuf'

Conflicts:
src/gallium/drivers/softpipe/sp_draw_arrays.c
src/mesa/state_tracker/st_draw_feedback.c
31 files changed:
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/drivers/cell/ppu/cell_context.h
src/gallium/drivers/cell/ppu/cell_draw_arrays.c
src/gallium/drivers/cell/ppu/cell_state_emit.c
src/gallium/drivers/i915/i915_state.c
src/gallium/drivers/i965/brw_pipe_shader.c
src/gallium/drivers/identity/id_context.c
src/gallium/drivers/llvmpipe/lp_context.c
src/gallium/drivers/llvmpipe/lp_context.h
src/gallium/drivers/llvmpipe/lp_state.h
src/gallium/drivers/llvmpipe/lp_state_fs.c
src/gallium/drivers/nv04/nv04_state.c
src/gallium/drivers/nv30/nv30_state.c
src/gallium/drivers/nv40/nv40_state.c
src/gallium/drivers/nv50/nv50_state.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/softpipe/sp_context.c
src/gallium/drivers/softpipe/sp_context.h
src/gallium/drivers/softpipe/sp_draw_arrays.c
src/gallium/drivers/softpipe/sp_state.h
src/gallium/drivers/softpipe/sp_state_fs.c
src/gallium/drivers/trace/tr_context.c
src/gallium/drivers/trace/tr_dump_state.c
src/gallium/include/pipe/p_context.h
src/gallium/include/pipe/p_state.h
src/gallium/state_trackers/python/gallium.i
src/gallium/state_trackers/python/p_context.i
src/gallium/state_trackers/python/retrace/interpreter.py
src/gallium/state_trackers/xorg/xorg_renderer.c
src/mesa/state_tracker/st_context.c
src/mesa/state_tracker/st_draw_feedback.c