summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/softpipe/sp_fs.h
AgeCommit message (Collapse)Author
2008-02-15Merge commit 'origin/gallium-0.1' into gallium-0.1Keith Whitwell
Conflicts: src/gallium/drivers/softpipe/sp_quad_fs.c src/gallium/drivers/softpipe/sp_state.h src/gallium/drivers/softpipe/sp_state_fs.c