diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-12-31 07:12:27 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-12-31 07:12:27 +0000 |
| commit | 051645c92924bf915d82bf219f2ed67309b5577a (patch) | |
| tree | 4aae126dd8e5a18c6a9926a5468d1561e6038a07 /lib/mesa/src/gallium/drivers/softpipe/sp_state_sampler.c | |
| parent | 2dae6fe6f74cf7fb9fd65285302c0331d9786b00 (diff) | |
Merge Mesa 17.2.8
Diffstat (limited to 'lib/mesa/src/gallium/drivers/softpipe/sp_state_sampler.c')
| -rw-r--r-- | lib/mesa/src/gallium/drivers/softpipe/sp_state_sampler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mesa/src/gallium/drivers/softpipe/sp_state_sampler.c b/lib/mesa/src/gallium/drivers/softpipe/sp_state_sampler.c index a4185c2b6..c10fd918f 100644 --- a/lib/mesa/src/gallium/drivers/softpipe/sp_state_sampler.c +++ b/lib/mesa/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]) { |