swrast: Support sampler object for texture fetching state
authorPauli Nieminen <pauli.nieminen@linux.intel.com>
Tue, 12 Jun 2012 18:38:56 +0000 (21:38 +0300)
committerEric Anholt <eric@anholt.net>
Wed, 1 Aug 2012 22:55:51 +0000 (15:55 -0700)
commitcbdc1d53542b3ecca0085399c4bb3b3371f94809
treec835fd6c56f22692f8db127a882ae94e7a70d498
parent8129dabb5f5ff717bb1ca32710ca6204d5345461
swrast: Support sampler object for texture fetching state

swrast needs to pass sampler object into all texture fetching functions
to use correct sampling state when sampler object is bound to the unit.
The changes were made using half manual regular expression replace.

v2: Fix NULL deref in _swrast_choose_triangle(), because the _Current
    values aren't set yet, so we need to look at our texObj2D. (anholt)

Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
src/mesa/swrast/s_atifragshader.c
src/mesa/swrast/s_context.c
src/mesa/swrast/s_context.h
src/mesa/swrast/s_fragprog.c
src/mesa/swrast/s_span.c
src/mesa/swrast/s_texcombine.c
src/mesa/swrast/s_texfetch.c
src/mesa/swrast/s_texfetch.h
src/mesa/swrast/s_texfilter.c
src/mesa/swrast/s_triangle.c
src/mesa/tnl/t_vb_program.c