diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2015-07-05 16:54:44 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2015-07-23 00:59:23 +0200 |
| commit | 5ef1782b9ff8aa06f5b7fdbc7ade3e80131d1fda (patch) | |
| tree | 214ae3a1fcf2b8c7427e9becbeb700ed6eb8cb6f /src/mesa/state_tracker/st_cb_drawpixels.c | |
| parent | 4ef7d93a941257b18506eae056631e8f4a11f893 (diff) | |
| download | external_mesa3d-5ef1782b9ff8aa06f5b7fdbc7ade3e80131d1fda.zip external_mesa3d-5ef1782b9ff8aa06f5b7fdbc7ade3e80131d1fda.tar.gz external_mesa3d-5ef1782b9ff8aa06f5b7fdbc7ade3e80131d1fda.tar.bz2 | |
st/mesa: use cso_set_samplers
Diffstat (limited to 'src/mesa/state_tracker/st_cb_drawpixels.c')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_drawpixels.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c index f67f00d..b372697 100644 --- a/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/src/mesa/state_tracker/st_cb_drawpixels.c @@ -757,6 +757,8 @@ draw_textured_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z, /* texture sampling state: */ { struct pipe_sampler_state sampler; + const struct pipe_sampler_state *states[2] = {&sampler, &sampler}; + memset(&sampler, 0, sizeof(sampler)); sampler.wrap_s = PIPE_TEX_WRAP_CLAMP; sampler.wrap_t = PIPE_TEX_WRAP_CLAMP; @@ -766,11 +768,8 @@ draw_textured_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z, sampler.mag_img_filter = PIPE_TEX_FILTER_NEAREST; sampler.normalized_coords = normalized; - cso_single_sampler(cso, PIPE_SHADER_FRAGMENT, 0, &sampler); - if (num_sampler_view > 1) { - cso_single_sampler(cso, PIPE_SHADER_FRAGMENT, 1, &sampler); - } - cso_single_sampler_done(cso, PIPE_SHADER_FRAGMENT); + cso_set_samplers(cso, PIPE_SHADER_FRAGMENT, + num_sampler_view > 1 ? 2 : 1, states); } /* viewport state: viewport matching window dims */ |