Import Mesa 17.1.6

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/mesa/src/gallium/drivers/softpipe/sp_state_shader.c b/lib/mesa/src/gallium/drivers/softpipe/sp_state_shader.c
index a7456628d..da4792757 100644
--- a/lib/mesa/src/gallium/drivers/softpipe/sp_state_shader.c
+++ b/lib/mesa/src/gallium/drivers/softpipe/sp_state_shader.c
@@ -337,7 +337,7 @@ softpipe_delete_gs_state(struct pipe_context *pipe, void *gs)
 
 static void
 softpipe_set_constant_buffer(struct pipe_context *pipe,
-                             uint shader, uint index,
+                             enum pipe_shader_type shader, uint index,
                              const struct pipe_constant_buffer *cb)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
@@ -420,7 +420,7 @@ static void
 softpipe_delete_compute_state(struct pipe_context *pipe,
                               void *cs)
 {
-   struct softpipe_context *softpipe = softpipe_context(pipe);
+   MAYBE_UNUSED struct softpipe_context *softpipe = softpipe_context(pipe);
    struct sp_compute_shader *state = (struct sp_compute_shader *)cs;
 
    assert(softpipe->cs != state);