diff options
| author | Brian Paul <[email protected]> | 2013-09-12 15:33:44 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-10-03 14:05:28 -0600 |
| commit | 3925e521d65e43da90dd8ee3e3fc239602d0ab9b (patch) | |
| tree | f637c1a9e2b9fe10bd2c3abd210e5a16f5b46f46 | |
| parent | 9fa6722a68c94589a5b74baa7ae79d314b60b20c (diff) | |
util: remove old bind_fragment_sampler_states() calls from blitter code
| -rw-r--r-- | src/gallium/auxiliary/util/u_blitter.c | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index 456d65c99d2..a51b9ef20b3 100644 --- a/src/gallium/auxiliary/util/u_blitter.c +++ b/src/gallium/auxiliary/util/u_blitter.c @@ -528,14 +528,10 @@ static void blitter_restore_textures(struct blitter_context_priv *ctx) unsigned i; /* Fragment sampler states. */ - if (pipe->bind_sampler_states) - pipe->bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0, - ctx->base.saved_num_sampler_states, - ctx->base.saved_sampler_states); - else - pipe->bind_fragment_sampler_states(pipe, - ctx->base.saved_num_sampler_states, - ctx->base.saved_sampler_states); + pipe->bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0, + ctx->base.saved_num_sampler_states, + ctx->base.saved_sampler_states); + ctx->base.saved_num_sampler_states = ~0; /* Fragment sampler views. */ @@ -1314,10 +1310,7 @@ void util_blitter_blit_generic(struct blitter_context *blitter, views[1] = pipe->create_sampler_view(pipe, src->texture, &templ); pipe->set_fragment_sampler_views(pipe, 2, views); - if (pipe->bind_sampler_states) - pipe->bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0, 2, samplers); - else - pipe->bind_fragment_sampler_states(pipe, 2, samplers); + pipe->bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0, 2, samplers); pipe_sampler_view_reference(&views[1], NULL); } else if (blit_stencil) { @@ -1332,20 +1325,14 @@ void util_blitter_blit_generic(struct blitter_context *blitter, view = pipe->create_sampler_view(pipe, src->texture, &templ); pipe->set_fragment_sampler_views(pipe, 1, &view); - if (pipe->bind_sampler_states) - pipe->bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, - 0, 1, &sampler_state); - else - pipe->bind_fragment_sampler_states(pipe, 1, &sampler_state); + pipe->bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, + 0, 1, &sampler_state); pipe_sampler_view_reference(&view, NULL); } else { pipe->set_fragment_sampler_views(pipe, 1, &src); - if (pipe->bind_sampler_states) - pipe->bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, - 0, 1, &sampler_state); - else - pipe->bind_fragment_sampler_states(pipe, 1, &sampler_state); + pipe->bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, + 0, 1, &sampler_state); } pipe->bind_vertex_elements_state(pipe, ctx->velem_state); |