Merge branch 'master' into instanced-arrays
authorMichal Krol <michal@vmware.com>
Tue, 5 Jan 2010 10:04:50 +0000 (11:04 +0100)
committerMichal Krol <michal@vmware.com>
Tue, 5 Jan 2010 10:04:50 +0000 (11:04 +0100)
commit9b21b3c52a8a7d58d08151d1a6bf25c472dec213
treed9083b6af4e2e9b70a7fa6cd31bac45a36e0f6b6
parent543b9566bdaa48fea2df1866fa1310c1cdbcde27
parent1f9aa38f4e2be47229d92be2c1189c2b8d9c7133
Merge branch 'master' into instanced-arrays

Conflicts:
src/gallium/auxiliary/tgsi/tgsi_dump.c
src/gallium/include/pipe/p_shader_tokens.h
13 files changed:
src/gallium/auxiliary/draw/draw_context.h
src/gallium/auxiliary/draw/draw_private.h
src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
src/gallium/auxiliary/draw/draw_vs_varient.c
src/gallium/auxiliary/tgsi/tgsi_dump.c
src/gallium/auxiliary/tgsi/tgsi_ureg.c
src/gallium/auxiliary/tgsi/tgsi_ureg.h
src/gallium/drivers/softpipe/sp_context.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_shader_tokens.h