diff options
| author | Brian Paul <brianp@vmware.com> | 2013-09-12 15:36:51 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2013-10-03 14:05:28 -0600 |
| commit | f233ee0cd6ba296d38f4f4dccdef67929cf8739a (patch) | |
| tree | 7a5b5c4e210c26d418fcadce9f44c749f592b7cc | |
| parent | d0520d5bf6fb8dec8434d6b68dd014227a1bdaa3 (diff) | |
galahad: remove old bind_*_sampler_states() functions
| -rw-r--r-- | src/gallium/drivers/galahad/glhd_context.c | 51 |
1 files changed, 1 insertions, 50 deletions
diff --git a/src/gallium/drivers/galahad/glhd_context.c b/src/gallium/drivers/galahad/glhd_context.c index f96543e1e90..dc3d5f056df 100644 --- a/src/gallium/drivers/galahad/glhd_context.c +++ b/src/gallium/drivers/galahad/glhd_context.c @@ -197,54 +197,9 @@ galahad_context_bind_sampler_states(struct pipe_context *_pipe, num_samplers, PIPE_MAX_SAMPLERS); } - if (pipe->bind_sampler_states) { - pipe->bind_sampler_states(pipe, shader, start, num_samplers, samplers); - } - else { - switch (shader) { - case PIPE_SHADER_VERTEX: - pipe->bind_vertex_sampler_states(pipe, num_samplers, samplers); - break; - case PIPE_SHADER_FRAGMENT: - pipe->bind_fragment_sampler_states(pipe, num_samplers, samplers); - break; - case PIPE_SHADER_GEOMETRY: - pipe->bind_geometry_sampler_states(pipe, num_samplers, samplers); - break; - default: - assert(0); - } - } -} - -static void -galahad_context_bind_vertex_sampler_states(struct pipe_context *_pipe, - unsigned num_samplers, - void **samplers) -{ - galahad_context_bind_sampler_states(_pipe, PIPE_SHADER_VERTEX, - 0, num_samplers, samplers); -} - -static void -galahad_context_bind_fragment_sampler_states(struct pipe_context *_pipe, - unsigned num_samplers, - void **samplers) -{ - galahad_context_bind_sampler_states(_pipe, PIPE_SHADER_FRAGMENT, - 0, num_samplers, samplers); -} - -static void -galahad_context_bind_geometry_sampler_states(struct pipe_context *_pipe, - unsigned num_samplers, - void **samplers) -{ - galahad_context_bind_sampler_states(_pipe, PIPE_SHADER_GEOMETRY, - 0, num_samplers, samplers); + pipe->bind_sampler_states(pipe, shader, start, num_samplers, samplers); } - static void galahad_context_delete_sampler_state(struct pipe_context *_pipe, void *sampler) @@ -1070,10 +1025,6 @@ galahad_context_create(struct pipe_screen *_screen, struct pipe_context *pipe) GLHD_PIPE_INIT(delete_blend_state); GLHD_PIPE_INIT(create_sampler_state); GLHD_PIPE_INIT(bind_sampler_states); - GLHD_PIPE_INIT(bind_fragment_sampler_states); - GLHD_PIPE_INIT(bind_vertex_sampler_states); - GLHD_PIPE_INIT(bind_geometry_sampler_states); - //GLHD_PIPE_INIT(bind_compute_sampler_states); GLHD_PIPE_INIT(delete_sampler_state); GLHD_PIPE_INIT(create_rasterizer_state); GLHD_PIPE_INIT(bind_rasterizer_state); |