From e5d000c3f1df8af82c602bb714b4da5ed8fe4347 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 12 Sep 2013 15:07:10 -0600 Subject: [PATCH] galahad: implement pipe_context::bind_sampler_states() --- src/gallium/drivers/galahad/glhd_context.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/gallium/drivers/galahad/glhd_context.c b/src/gallium/drivers/galahad/glhd_context.c index 3df22ce..f96543e 100644 --- a/src/gallium/drivers/galahad/glhd_context.c +++ b/src/gallium/drivers/galahad/glhd_context.c @@ -197,18 +197,23 @@ galahad_context_bind_sampler_states(struct pipe_context *_pipe, num_samplers, PIPE_MAX_SAMPLERS); } - 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); + 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); + } } } @@ -1064,6 +1069,7 @@ galahad_context_create(struct pipe_screen *_screen, struct pipe_context *pipe) GLHD_PIPE_INIT(bind_blend_state); 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); -- 2.7.4