diff options
| author | Corbin Simpson <MostAwesomeDude@gmail.com> | 2008-05-02 20:49:13 -0700 |
|---|---|---|
| committer | Corbin Simpson <MostAwesomeDude@gmail.com> | 2008-05-02 20:49:13 -0700 |
| commit | e081603850cb4e3839a76f0bfbb90cff922dff03 (patch) | |
| tree | 4326dbcde9b29913445cbbd5702edac865696da8 /src/mesa/drivers/dri/r128/r128_lock.h | |
| parent | 568d369d7747c6cc2a421a816c85d888ccfc9957 (diff) | |
| parent | 37924cf175b5f61ca85dab685ec5d7879519ebc4 (diff) | |
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
Diffstat (limited to 'src/mesa/drivers/dri/r128/r128_lock.h')
0 files changed, 0 insertions, 0 deletions