From 7413625ad357c87f409cd1673b40f8dffbc43259 Mon Sep 17 00:00:00 2001 From: Kai Wasserbäch Date: Sat, 27 Aug 2016 04:08:00 -0600 Subject: gallium: Use enum pipe_shader_type in bind_sampler_states() (v2) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v1 → v2: - Fixed indentation (noted by Brian Paul) - Removed second assert from nouveau's switch statements (suggested by Brian Paul) Signed-off-by: Kai Wasserbäch Reviewed-by: Samuel Pitoiset Reviewed-by: Brian Paul --- src/gallium/auxiliary/draw/draw_pipe_aaline.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/gallium/auxiliary/draw/draw_pipe_aaline.c') diff --git a/src/gallium/auxiliary/draw/draw_pipe_aaline.c b/src/gallium/auxiliary/draw/draw_pipe_aaline.c index a5f07236e83..1ea77da90e1 100644 --- a/src/gallium/auxiliary/draw/draw_pipe_aaline.c +++ b/src/gallium/auxiliary/draw/draw_pipe_aaline.c @@ -118,10 +118,12 @@ struct aaline_stage void (*driver_bind_fs_state)(struct pipe_context *, void *); void (*driver_delete_fs_state)(struct pipe_context *, void *); - void (*driver_bind_sampler_states)(struct pipe_context *, unsigned, unsigned, + void (*driver_bind_sampler_states)(struct pipe_context *, + enum pipe_shader_type, unsigned, unsigned, void **); - void (*driver_set_sampler_views)(struct pipe_context *, unsigned shader, + void (*driver_set_sampler_views)(struct pipe_context *, + enum pipe_shader_type shader, unsigned start, unsigned count, struct pipe_sampler_view **); }; @@ -884,7 +886,8 @@ aaline_delete_fs_state(struct pipe_context *pipe, void *fs) static void -aaline_bind_sampler_states(struct pipe_context *pipe, unsigned shader, +aaline_bind_sampler_states(struct pipe_context *pipe, + enum pipe_shader_type shader, unsigned start, unsigned num, void **sampler) { struct aaline_stage *aaline = aaline_stage_from_pipe(pipe); -- cgit v1.2.3