gallium: Use enum pipe_shader_type in set_shader_buffers()

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Kai Wasserbäch 2016-08-27 04:08:00 -06:00 committed by Brian Paul
parent 532db3b788
commit 15fe288dea
7 changed files with 12 additions and 9 deletions

View file

@ -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)
{

View file

@ -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)
{

View file

@ -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)

View file

@ -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)
{

View file

@ -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);

View file

@ -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;

View file

@ -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];