diff options
author | Brian Paul <brianp@vmware.com> | 2013-09-12 15:18:59 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2013-09-12 18:12:19 -0600 |
commit | c39f1558a4d98905ab5f2687562b0c1f82f888e9 (patch) | |
tree | cfb6d7da34c4798aac75b72965cc16475a45c093 | |
parent | 866a9a8256a92e57b95c837d54ebe8ac144d9c85 (diff) |
identity: remove old bind_*_sampler_states() functions
-rw-r--r-- | src/gallium/drivers/identity/id_context.c | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/src/gallium/drivers/identity/id_context.c b/src/gallium/drivers/identity/id_context.c index de502fa99c..5901e1c9bc 100644 --- a/src/gallium/drivers/identity/id_context.c +++ b/src/gallium/drivers/identity/id_context.c @@ -168,45 +168,7 @@ identity_bind_sampler_states(struct pipe_context *_pipe, struct identity_context *id_pipe = identity_context(_pipe); struct pipe_context *pipe = id_pipe->pipe; - if (pipe->bind_sampler_states) { - pipe->bind_sampler_states(pipe, shader, start, num_samplers, samplers); - } - else { - /* remove this when we have pipe->bind_sampler_states(..., start, ...) */ - assert(start == 0); - - switch (shader) { - case PIPE_SHADER_VERTEX: - pipe->bind_vertex_sampler_states(pipe, num_samplers, samplers); - break; - case PIPE_SHADER_GEOMETRY: - pipe->bind_geometry_sampler_states(pipe, num_samplers, samplers); - break; - case PIPE_SHADER_FRAGMENT: - pipe->bind_fragment_sampler_states(pipe, num_samplers, samplers); - break; - default: - debug_error("Unexpected shader in identity_bind_sampler_states()"); - } - } -} - -static void -identity_bind_fragment_sampler_states(struct pipe_context *_pipe, - unsigned num_samplers, - void **samplers) -{ - identity_bind_sampler_states(_pipe, PIPE_SHADER_FRAGMENT, - 0, num_samplers, samplers); -} - -static void -identity_bind_vertex_sampler_states(struct pipe_context *_pipe, - unsigned num_samplers, - void **samplers) -{ - identity_bind_sampler_states(_pipe, PIPE_SHADER_VERTEX, - 0, num_samplers, samplers); + pipe->bind_sampler_states(pipe, shader, start, num_samplers, samplers); } static void @@ -897,8 +859,6 @@ identity_context_create(struct pipe_screen *_screen, struct pipe_context *pipe) id_pipe->base.delete_blend_state = identity_delete_blend_state; id_pipe->base.create_sampler_state = identity_create_sampler_state; id_pipe->base.bind_sampler_states = identity_bind_sampler_states; - id_pipe->base.bind_fragment_sampler_states = identity_bind_fragment_sampler_states; - id_pipe->base.bind_vertex_sampler_states = identity_bind_vertex_sampler_states; id_pipe->base.delete_sampler_state = identity_delete_sampler_state; id_pipe->base.create_rasterizer_state = identity_create_rasterizer_state; id_pipe->base.bind_rasterizer_state = identity_bind_rasterizer_state; |