diff options
| author | Thomas Hellstrom <[email protected]> | 2014-04-07 13:42:25 -0700 |
|---|---|---|
| committer | Thomas Hellstrom <[email protected]> | 2014-04-07 22:34:10 -0700 |
| commit | 47f60cbb7197bd9f8bb27ca3a2b160e8a563619a (patch) | |
| tree | 4f6225d144e01d4da57575cacc60abecea6ae940 | |
| parent | e5d2c5b89944007d69347fd419789312be573d0c (diff) | |
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" <[email protected]>
Signed-off-by: Thomas Hellstrom <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
| -rw-r--r-- | src/gallium/state_trackers/xa/xa_renderer.c | 5 |
1 files 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 0f5044df9e2..8a122dc2182 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 */ |