summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorKai Wasserbäch <kai@dev.carbon-project.org>2016-08-27 04:08:00 -0600
committerBrian Paul <brianp@vmware.com>2016-08-29 08:45:48 -0600
commit7413625ad357c87f409cd1673b40f8dffbc43259 (patch)
tree238163910ff8f8b3abfc45350618e7eecf3c55ea /src/mesa
parented24d79ed712f22ca12a1986a024c522d202dc37 (diff)
gallium: Use enum pipe_shader_type in bind_sampler_states() (v2)
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 <kai@dev.carbon-project.org> Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/state_tracker/st_atom_sampler.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c
index 88ae7a09e46..6b36ac74aad 100644
--- a/src/mesa/state_tracker/st_atom_sampler.c
+++ b/src/mesa/state_tracker/st_atom_sampler.c
@@ -237,7 +237,7 @@ convert_sampler(struct st_context *st,
*/
static void
update_shader_samplers(struct st_context *st,
- unsigned shader_stage,
+ enum pipe_shader_type shader_stage,
const struct gl_program *prog,
unsigned max_units,
struct pipe_sampler_state *samplers,