diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_descriptors.c | 8 | ||||
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_state_image.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/trace/tr_context.c | 2 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_context.h | 3 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_atom_atomicbuf.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_atom_storagebuf.c | 2 |
7 files changed, 12 insertions, 9 deletions
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c index c9b0e3fcf43..ee1e184e798 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c @@ -1409,7 +1409,7 @@ nvc0_bind_buffers_range(struct nvc0_context *nvc0, const unsigned t, static void nvc0_set_shader_buffers(struct pipe_context *pipe, - unsigned shader, + enum pipe_shader_type shader, unsigned start, unsigned nr, const struct pipe_shader_buffer *buffers) { diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 573c8a85817..dfd0607891d 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -1060,19 +1060,21 @@ static void si_pipe_set_constant_buffer(struct pipe_context *ctx, /* SHADER BUFFERS */ static unsigned -si_shader_buffer_descriptors_idx(unsigned shader) +si_shader_buffer_descriptors_idx(enum pipe_shader_type shader) { return SI_DESCS_FIRST_SHADER + shader * SI_NUM_SHADER_DESCS + SI_SHADER_DESCS_SHADER_BUFFERS; } static struct si_descriptors * -si_shader_buffer_descriptors(struct si_context *sctx, unsigned shader) +si_shader_buffer_descriptors(struct si_context *sctx, + enum pipe_shader_type shader) { return &sctx->descriptors[si_shader_buffer_descriptors_idx(shader)]; } -static void si_set_shader_buffers(struct pipe_context *ctx, unsigned shader, +static void si_set_shader_buffers(struct pipe_context *ctx, + enum pipe_shader_type shader, unsigned start_slot, unsigned count, const struct pipe_shader_buffer *sbuffers) { diff --git a/src/gallium/drivers/softpipe/sp_state_image.c b/src/gallium/drivers/softpipe/sp_state_image.c index 553a76a2c87..c5ef466e131 100644 --- a/src/gallium/drivers/softpipe/sp_state_image.c +++ b/src/gallium/drivers/softpipe/sp_state_image.c @@ -53,7 +53,7 @@ static void softpipe_set_shader_images(struct pipe_context *pipe, } static void softpipe_set_shader_buffers(struct pipe_context *pipe, - unsigned shader, + enum pipe_shader_type shader, unsigned start, unsigned num, const struct pipe_shader_buffer *buffers) diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c index a648297fa9b..61b69c23cee 100644 --- a/src/gallium/drivers/trace/tr_context.c +++ b/src/gallium/drivers/trace/tr_context.c @@ -1711,7 +1711,7 @@ trace_context_set_tess_state(struct pipe_context *_context, static void trace_context_set_shader_buffers(struct pipe_context *_context, - unsigned shader, + enum pipe_shader_type shader, unsigned start, unsigned nr, const struct pipe_shader_buffer *buffers) { diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h index b74679d1f82..bea192477c8 100644 --- a/src/gallium/include/pipe/p_context.h +++ b/src/gallium/include/pipe/p_context.h @@ -314,7 +314,8 @@ struct pipe_context { * unless it's NULL, in which case no buffers will * be bound. */ - void (*set_shader_buffers)(struct pipe_context *, unsigned shader, + void (*set_shader_buffers)(struct pipe_context *, + enum pipe_shader_type shader, unsigned start_slot, unsigned count, const struct pipe_shader_buffer *buffers); diff --git a/src/mesa/state_tracker/st_atom_atomicbuf.c b/src/mesa/state_tracker/st_atom_atomicbuf.c index 7dde76a77f1..f48ae61377f 100644 --- a/src/mesa/state_tracker/st_atom_atomicbuf.c +++ b/src/mesa/state_tracker/st_atom_atomicbuf.c @@ -43,7 +43,7 @@ static void st_bind_atomics(struct st_context *st, struct gl_shader_program *prog, - unsigned shader_type) + enum pipe_shader_type shader_type) { unsigned i; diff --git a/src/mesa/state_tracker/st_atom_storagebuf.c b/src/mesa/state_tracker/st_atom_storagebuf.c index a5a760e5ac0..1b6ed99e54a 100644 --- a/src/mesa/state_tracker/st_atom_storagebuf.c +++ b/src/mesa/state_tracker/st_atom_storagebuf.c @@ -42,7 +42,7 @@ static void st_bind_ssbos(struct st_context *st, struct gl_linked_shader *shader, - unsigned shader_type) + enum pipe_shader_type shader_type) { unsigned i; struct pipe_shader_buffer buffers[MAX_SHADER_STORAGE_BUFFERS]; |