[Mesa-dev] [PATCH 16/21] swrast: Support sampler object for texture fetching state

[Marek Olšák]

On Mon, Jun 11, 2012 at 8:59 AM, Pauli Nieminen
<pauli.nieminen at linux.intel.com> wrote:
> 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.
>
> With the patch llvmpipe didn't get any regressions.

Hi Pauli,

llvmpipe doesn't use the classic swrast code, only the original
Software Rasterizer driver does.

Marek

>
> Signed-off-by: Pauli Nieminen <pauli.nieminen at linux.intel.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      |   20 +-
>  src/mesa/swrast/s_texfetch.h      |    2 +-
>  src/mesa/swrast/s_texfilter.c     |  692 ++++++++++++++++++++-----------------
>  src/mesa/tnl/t_vb_program.c       |    4 +-
>  10 files changed, 438 insertions(+), 358 deletions(-)