From f676c700cc3faa26ab90a36b7af15cbc282db069 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sun, 5 Mar 2017 12:29:44 -0700 Subject: [PATCH] softpipe: s/unsigned/enum pipe_shader_type/ Reviewed-by: Edward O'Callaghan --- src/gallium/drivers/softpipe/sp_state_derived.c | 2 +- src/gallium/drivers/softpipe/sp_state_sampler.c | 2 +- src/gallium/drivers/softpipe/sp_tex_sample.c | 3 ++- src/gallium/drivers/softpipe/sp_tex_sample.h | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/softpipe/sp_state_derived.c b/src/gallium/drivers/softpipe/sp_state_derived.c index 0083e332785..f34997ab3d0 100644 --- a/src/gallium/drivers/softpipe/sp_state_derived.c +++ b/src/gallium/drivers/softpipe/sp_state_derived.c @@ -282,7 +282,7 @@ compute_cliprect(struct softpipe_context *sp) static void set_shader_sampler(struct softpipe_context *softpipe, - unsigned shader, + enum pipe_shader_type shader, int max_sampler) { int i; diff --git a/src/gallium/drivers/softpipe/sp_state_sampler.c b/src/gallium/drivers/softpipe/sp_state_sampler.c index a4185c2b641..c10fd918fd8 100644 --- a/src/gallium/drivers/softpipe/sp_state_sampler.c +++ b/src/gallium/drivers/softpipe/sp_state_sampler.c @@ -167,7 +167,7 @@ prepare_shader_sampling( struct softpipe_context *sp, unsigned num, struct pipe_sampler_view **views, - unsigned shader_type, + enum pipe_shader_type shader_type, struct pipe_resource *mapped_tex[PIPE_MAX_SHADER_SAMPLER_VIEWS]) { diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.c b/src/gallium/drivers/softpipe/sp_tex_sample.c index c457f896e49..3a8ad2eef43 100644 --- a/src/gallium/drivers/softpipe/sp_tex_sample.c +++ b/src/gallium/drivers/softpipe/sp_tex_sample.c @@ -3443,7 +3443,8 @@ softpipe_create_sampler_state(struct pipe_context *pipe, compute_lambda_func -softpipe_get_lambda_func(const struct pipe_sampler_view *view, unsigned shader) +softpipe_get_lambda_func(const struct pipe_sampler_view *view, + enum pipe_shader_type shader) { if (shader != PIPE_SHADER_FRAGMENT) return compute_lambda_vert; diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.h b/src/gallium/drivers/softpipe/sp_tex_sample.h index d591487d1b4..f7774f5e883 100644 --- a/src/gallium/drivers/softpipe/sp_tex_sample.h +++ b/src/gallium/drivers/softpipe/sp_tex_sample.h @@ -155,7 +155,8 @@ struct sp_tgsi_sampler }; compute_lambda_func -softpipe_get_lambda_func(const struct pipe_sampler_view *view, unsigned shader); +softpipe_get_lambda_func(const struct pipe_sampler_view *view, + enum pipe_shader_type shader); void * -- 2.30.2