Mesa (master): softpipe: don' t use samplers with prebaked sampler and sampler_view state

[Roland Scheidegger]

Module: Mesa
Branch: master
Commit: ef17cc9cb697a7146cf2a3dba2eb0f6a968918cc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef17cc9cb697a7146cf2a3dba2eb0f6a968918cc

Author: Roland Scheidegger <sroland at vmware.com>
Date:   Fri Mar  8 22:29:34 2013 +0100

softpipe: don't use samplers with prebaked sampler and sampler_view state

This is needed for handling the dx10-style sample opcodes.
This also simplifies the logic by getting rid of sampler variants
completely (sampler_views though OTOH have sort of variants because
some of their state is different depending on the shader stage they
are bound to).
No significant performance difference (openarena run:
840 frames in 459.8 seconds vs. 840 frames in 460.5 seconds).

v2: fix reference counting bug spotted by Jose.

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>

---

 src/gallium/drivers/softpipe/sp_context.h       |    8 +-
 src/gallium/drivers/softpipe/sp_state.h         |    8 +
 src/gallium/drivers/softpipe/sp_state_derived.c |   33 +-
 src/gallium/drivers/softpipe/sp_state_sampler.c |  184 +---
 src/gallium/drivers/softpipe/sp_tex_sample.c    | 1274 ++++++++++++-----------
 src/gallium/drivers/softpipe/sp_tex_sample.h    |  138 +--
 6 files changed, 779 insertions(+), 866 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=ef17cc9cb697a7146cf2a3dba2eb0f6a968918cc