Merge branch 'softpipe-opt'
authorKeith Whitwell <keithw@vmware.com>
Wed, 23 Sep 2009 16:37:28 +0000 (17:37 +0100)
committerKeith Whitwell <keithw@vmware.com>
Wed, 23 Sep 2009 16:37:28 +0000 (17:37 +0100)
commit890679d4322e7ba4f12f32532a3fdd277edff886
tree37df5e8a53f7da9fdcaf2e9660c694e28e14b5bc
parenta1fa770c01d913658900de1c267fb4c41bc6300d
parent75276ea316610a5737f2115326482024aa09d02a
Merge branch 'softpipe-opt'

Conflicts:
progs/demos/cubemap.c
src/gallium/drivers/softpipe/sp_tex_sample.c
src/gallium/drivers/softpipe/sp_texture.c
progs/demos/cubemap.c
src/gallium/auxiliary/util/u_math.h
src/gallium/drivers/softpipe/sp_context.c
src/gallium/drivers/softpipe/sp_state_derived.c
src/gallium/drivers/softpipe/sp_tex_sample.c
src/gallium/drivers/softpipe/sp_texture.c
src/gallium/drivers/softpipe/sp_texture.h
src/gallium/winsys/xlib/xlib_softpipe.c
src/mesa/swrast/s_texfilter.c