Merge branch 'r500-support' into r500test
authorCorbin Simpson <MostAwesomeDude@gmail.com>
Sat, 3 May 2008 03:49:13 +0000 (20:49 -0700)
committerCorbin Simpson <MostAwesomeDude@gmail.com>
Sat, 3 May 2008 03:49:13 +0000 (20:49 -0700)
commite081603850cb4e3839a76f0bfbb90cff922dff03
tree4326dbcde9b29913445cbbd5702edac865696da8
parent568d369d7747c6cc2a421a816c85d888ccfc9957
parent37924cf175b5f61ca85dab685ec5d7879519ebc4
Merge branch 'r500-support' into r500test
Bringing the FPS code up-to-date.
Conflicts:

src/mesa/drivers/dri/r300/r300_emit.c
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/r500_fragprog.c
src/mesa/drivers/dri/r300/r500_fragprog.h
src/mesa/drivers/dri/r300/r300_state.c