Module: Mesa
Branch: master
Commit: cbdc1d53542b3ecca0085399c4bb3b3371f94809
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cbdc1d53542b3ecca0085399c4bb3b3371f94809
Author: Pauli Nieminen <pauli.niemi...@linux.intel.com>
Date: Tue Jun 12 21:38:56 2012 +0300
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.niemi...@linux.intel.com>
Reviewed-by: Brian Paul <bri...@vmware.com>
---
src/mesa/swrast/s_atifragshader.c | 6 +-
src/mesa/swrast/s_context.c | 4 +-
src/mesa/swrast/s_context.h | 1 +
src/mesa/swrast/s_fragprog.c | 17 +-
src/mesa/swrast/s_span.c | 8 +-
src/mesa/swrast/s_texcombine.c | 42 ++-
src/mesa/swrast/s_texfetch.c | 18 +-
src/mesa/swrast/s_texfetch.h | 2 +-
src/mesa/swrast/s_texfilter.c | 692 ++++++++++++++++++++-----------------
src/mesa/swrast/s_triangle.c | 16 +-
src/mesa/tnl/t_vb_program.c | 4 +-
11 files changed, 449 insertions(+), 361 deletions(-)
Diff:
http://cgit.freedesktop.org/mesa/mesa/diff/?id=cbdc1d53542b3ecca0085399c4bb3b3371f94809
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
