From bcf7508a7d2127028a6ec7d2c43d52603ddcb730 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 12 Sep 2013 15:19:46 -0600 Subject: [PATCH] rbug: remove old bind_*_sampler_states() functions --- src/gallium/drivers/rbug/rbug_context.c | 54 +------------------------ 1 file changed, 1 insertion(+), 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; -- 2.30.2