Merge remote-tracking branch 'mareko/r300g-draw-instanced' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Fri, 3 Jun 2011 08:47:56 +0000 (10:47 +0200)
committerChristian König <deathsimple@vodafone.de>
Fri, 3 Jun 2011 08:47:56 +0000 (10:47 +0200)
commit10370b752cd793665feec9494e6545a3f04c69f9
treedc37e605259796a8cef29be46a4c0da46b083176
parentded2a9a628c58c2c8bfaaf6b8dd213e68de1dd20
parent596f09aa7bafd769912b1c0efe97434dff4c3f0b
Merge remote-tracking branch 'mareko/r300g-draw-instanced' into pipe-video
src/gallium/drivers/r300/r300_context.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/r300/r300_state_derived.c
src/gallium/drivers/r300/r300_tgsi_to_rc.c