summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2013-09-12 15:19:46 -0600
committerBrian Paul <[email protected]>2013-10-03 14:05:28 -0600
commitbcf7508a7d2127028a6ec7d2c43d52603ddcb730 (patch)
treea2a5e6cbf9cb80405cd19cea5590a5f7fbc05d33 /src
parent22480c5b5b23d1626d56b6bedd2e68b29ed23bf0 (diff)
rbug: remove old bind_*_sampler_states() functions
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/rbug/rbug_context.c54
1 files changed, 1 insertions, 53 deletions
diff --git a/src/gallium/drivers/rbug/rbug_context.c b/src/gallium/drivers/rbug/rbug_context.c
index be1f56144fe..083d3729f6e 100644
--- a/src/gallium/drivers/rbug/rbug_context.c
+++ b/src/gallium/drivers/rbug/rbug_context.c
@@ -271,57 +271,7 @@ rbug_bind_sampler_states(struct pipe_context *_pipe, unsigned shader,
struct pipe_context *pipe = rb_pipe->pipe;
pipe_mutex_lock(rb_pipe->call_mutex);
- if (pipe->bind_sampler_states) {
- pipe->bind_sampler_states(pipe, shader, start, count, samplers);
- }
- else {
- assert(start == 0);
- switch (shader) {
- case PIPE_SHADER_VERTEX:
- pipe->bind_vertex_sampler_states(pipe, count, samplers);
- break;
- case PIPE_SHADER_FRAGMENT:
- pipe->bind_fragment_sampler_states(pipe, count, samplers);
- break;
- case PIPE_SHADER_GEOMETRY:
- pipe->bind_geometry_sampler_states(pipe, count, samplers);
- break;
- default:
- ;
- }
- }
-
- pipe_mutex_unlock(rb_pipe->call_mutex);
-}
-
-
-static void
-rbug_bind_fragment_sampler_states(struct pipe_context *_pipe,
- unsigned num_samplers,
- void **samplers)
-{
- struct rbug_context *rb_pipe = rbug_context(_pipe);
- struct pipe_context *pipe = rb_pipe->pipe;
-
- pipe_mutex_lock(rb_pipe->call_mutex);
- pipe->bind_fragment_sampler_states(pipe,
- num_samplers,
- samplers);
- pipe_mutex_unlock(rb_pipe->call_mutex);
-}
-
-static void
-rbug_bind_vertex_sampler_states(struct pipe_context *_pipe,
- unsigned num_samplers,
- void **samplers)
-{
- struct rbug_context *rb_pipe = rbug_context(_pipe);
- struct pipe_context *pipe = rb_pipe->pipe;
-
- pipe_mutex_lock(rb_pipe->call_mutex);
- pipe->bind_vertex_sampler_states(pipe,
- num_samplers,
- samplers);
+ pipe->bind_sampler_states(pipe, shader, start, count, samplers);
pipe_mutex_unlock(rb_pipe->call_mutex);
}
@@ -1194,8 +1144,6 @@ rbug_context_create(struct pipe_screen *_screen, struct pipe_context *pipe)
rb_pipe->base.delete_blend_state = rbug_delete_blend_state;
rb_pipe->base.create_sampler_state = rbug_create_sampler_state;
rb_pipe->base.bind_sampler_states = rbug_bind_sampler_states;
- rb_pipe->base.bind_fragment_sampler_states = rbug_bind_fragment_sampler_states;
- rb_pipe->base.bind_vertex_sampler_states = rbug_bind_vertex_sampler_states;
rb_pipe->base.delete_sampler_state = rbug_delete_sampler_state;
rb_pipe->base.create_rasterizer_state = rbug_create_rasterizer_state;
rb_pipe->base.bind_rasterizer_state = rbug_bind_rasterizer_state;