Mesa (master): st/xa: Make sure unused samplers are set to NULL

[Thomas Hellstrom]

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

Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Mon Apr  7 13:42:25 2014 -0700

st/xa: Make sure unused samplers are set to NULL

renderer_copy_prepare was setting the first sampler but never telling
the cso code how many samplers were actually used. Fix this.

Cc: "10.1" <mesa-stable at freedesktop.org>
Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/gallium/state_trackers/xa/xa_renderer.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/state_trackers/xa/xa_renderer.c b/src/gallium/state_trackers/xa/xa_renderer.c
index 0f5044d..8a122dc 100644
--- a/src/gallium/state_trackers/xa/xa_renderer.c
+++ b/src/gallium/state_trackers/xa/xa_renderer.c
@@ -425,6 +425,7 @@ renderer_copy_prepare(struct xa_context *r,
     /* sampler */
     {
 	struct pipe_sampler_state sampler;
+        const struct pipe_sampler_state *p_sampler = &sampler;
 
 	memset(&sampler, 0, sizeof(sampler));
 	sampler.wrap_s = PIPE_TEX_WRAP_CLAMP_TO_EDGE;
@@ -434,8 +435,8 @@ renderer_copy_prepare(struct xa_context *r,
 	sampler.min_img_filter = PIPE_TEX_FILTER_NEAREST;
 	sampler.mag_img_filter = PIPE_TEX_FILTER_NEAREST;
 	sampler.normalized_coords = 1;
-	cso_single_sampler(r->cso, PIPE_SHADER_FRAGMENT, 0, &sampler);
-	cso_single_sampler_done(r->cso, PIPE_SHADER_FRAGMENT);
+        cso_set_samplers(r->cso, PIPE_SHADER_FRAGMENT, 1, &p_sampler);
+        r->num_bound_samplers = 1;
     }
 
     /* texture/sampler view */