diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-09-23 17:37:28 +0100 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-09-23 17:37:28 +0100 |
| commit | 890679d4322e7ba4f12f32532a3fdd277edff886 (patch) | |
| tree | 37df5e8a53f7da9fdcaf2e9660c694e28e14b5bc /progs/demos/arbfplight.c | |
| parent | a1fa770c01d913658900de1c267fb4c41bc6300d (diff) | |
| parent | 75276ea316610a5737f2115326482024aa09d02a (diff) | |
Merge branch 'softpipe-opt'
Conflicts:
progs/demos/cubemap.c
src/gallium/drivers/softpipe/sp_tex_sample.c
src/gallium/drivers/softpipe/sp_texture.c
Diffstat (limited to 'progs/demos/arbfplight.c')
0 files changed, 0 insertions, 0 deletions