OSDN Git Service

Merge branch 'instanced-arrays'
authorMichal Krol <michal@vmware.com>
Thu, 14 Jan 2010 17:11:41 +0000 (18:11 +0100)
committerMichal Krol <michal@vmware.com>
Thu, 14 Jan 2010 17:11:41 +0000 (18:11 +0100)
commit5184b02b0793136a15b7edf309d79a1efe1bc73d
tree939f7f87f623b0651e31ea84131c00630ae19f12
parent1bc77e9931a248b74e0ef6b6aa2f4c5b2d1a2ca3
parentea0cc47a4f769e19ceadb9704669244f5ba53871
Merge branch 'instanced-arrays'

Conflicts:
src/gallium/drivers/softpipe/sp_draw_arrays.c
src/gallium/drivers/softpipe/sp_draw_arrays.c
src/gallium/drivers/softpipe/sp_state.h
src/gallium/drivers/svga/svga_state_vs.c
src/gallium/include/pipe/p_context.h
src/gallium/include/pipe/p_state.h