diff options
20 files changed, 27 insertions, 20 deletions
diff --git a/src/gallium/drivers/ddebug/dd_context.c b/src/gallium/drivers/ddebug/dd_context.c index eae128a2a0f..775823c2a06 100644 --- a/src/gallium/drivers/ddebug/dd_context.c +++ b/src/gallium/drivers/ddebug/dd_context.c @@ -371,7 +371,7 @@ DD_IMM_STATE(polygon_stipple, const struct pipe_poly_stipple, *state, state) static void dd_context_set_constant_buffer(struct pipe_context *_pipe, - uint shader, uint index, + enum pipe_shader_type shader, uint index, const struct pipe_constant_buffer *constant_buffer) { struct dd_context *dctx = dd_context(_pipe); diff --git a/src/gallium/drivers/etnaviv/etnaviv_state.c b/src/gallium/drivers/etnaviv/etnaviv_state.c index 141a34a4c67..dbb6c5400a8 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_state.c +++ b/src/gallium/drivers/etnaviv/etnaviv_state.c @@ -86,7 +86,8 @@ etna_set_sample_mask(struct pipe_context *pctx, unsigned sample_mask) } static void -etna_set_constant_buffer(struct pipe_context *pctx, uint shader, uint index, +etna_set_constant_buffer(struct pipe_context *pctx, + enum pipe_shader_type shader, uint index, const struct pipe_constant_buffer *cb) { struct etna_context *ctx = etna_context(pctx); diff --git a/src/gallium/drivers/freedreno/freedreno_state.c b/src/gallium/drivers/freedreno/freedreno_state.c index 8c9040545c2..804d2b78624 100644 --- a/src/gallium/drivers/freedreno/freedreno_state.c +++ b/src/gallium/drivers/freedreno/freedreno_state.c @@ -89,7 +89,8 @@ fd_set_sample_mask(struct pipe_context *pctx, unsigned sample_mask) * index>0 will be UBO's.. well, I'll worry about that later */ static void -fd_set_constant_buffer(struct pipe_context *pctx, uint shader, uint index, +fd_set_constant_buffer(struct pipe_context *pctx, + enum pipe_shader_type shader, uint index, const struct pipe_constant_buffer *cb) { struct fd_context *ctx = fd_context(pctx); diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c index 950604407e9..3747922ba80 100644 --- a/src/gallium/drivers/i915/i915_state.c +++ b/src/gallium/drivers/i915/i915_state.c @@ -675,7 +675,7 @@ static void i915_delete_vs_state(struct pipe_context *pipe, void *shader) } static void i915_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 i915_context *i915 = i915_context(pipe); diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c index af47b5280ce..e6669593329 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_fs.c +++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c @@ -3054,7 +3054,7 @@ llvmpipe_delete_fs_state(struct pipe_context *pipe, void *fs) static void llvmpipe_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 llvmpipe_context *llvmpipe = llvmpipe_context(pipe); diff --git a/src/gallium/drivers/noop/noop_state.c b/src/gallium/drivers/noop/noop_state.c index 7ae89c8e711..32a54e958ea 100644 --- a/src/gallium/drivers/noop/noop_state.c +++ b/src/gallium/drivers/noop/noop_state.c @@ -158,7 +158,7 @@ static void noop_set_framebuffer_state(struct pipe_context *ctx, } static void noop_set_constant_buffer(struct pipe_context *ctx, - uint shader, uint index, + enum pipe_shader_type shader, uint index, const struct pipe_constant_buffer *cb) { } diff --git a/src/gallium/drivers/nouveau/nv30/nv30_state.c b/src/gallium/drivers/nouveau/nv30/nv30_state.c index c6eddd0486c..16b668bfe48 100644 --- a/src/gallium/drivers/nouveau/nv30/nv30_state.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_state.c @@ -326,7 +326,8 @@ nv30_set_sample_mask(struct pipe_context *pipe, unsigned sample_mask) } static void -nv30_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index, +nv30_set_constant_buffer(struct pipe_context *pipe, + enum pipe_shader_type shader, uint index, const struct pipe_constant_buffer *cb) { struct nv30_context *nv30 = nv30_context(pipe); diff --git a/src/gallium/drivers/nouveau/nv50/nv50_state.c b/src/gallium/drivers/nouveau/nv50/nv50_state.c index 99d70d129c2..6fa3d2cdc3c 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_state.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_state.c @@ -859,7 +859,8 @@ nv50_cp_state_bind(struct pipe_context *pipe, void *hwcso) } static void -nv50_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index, +nv50_set_constant_buffer(struct pipe_context *pipe, + enum pipe_shader_type shader, uint index, const struct pipe_constant_buffer *cb) { struct nv50_context *nv50 = nv50_context(pipe); diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c index bba35f1e9b3..32233a51ff2 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c @@ -712,7 +712,8 @@ nvc0_cp_state_bind(struct pipe_context *pipe, void *hwcso) } static void -nvc0_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index, +nvc0_set_constant_buffer(struct pipe_context *pipe, + enum pipe_shader_type shader, uint index, const struct pipe_constant_buffer *cb) { struct nvc0_context *nvc0 = nvc0_context(pipe); diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index 8c49bfdddd1..709cbd1a1f4 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -2003,7 +2003,7 @@ static void r300_delete_vs_state(struct pipe_context* pipe, void* shader) } static void r300_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 r300_context* r300 = r300_context(pipe); diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index 1fbe39209de..5bce71c871d 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -1055,7 +1055,8 @@ void r600_constant_buffers_dirty(struct r600_context *rctx, struct r600_constbuf } } -static void r600_set_constant_buffer(struct pipe_context *ctx, uint shader, uint index, +static void r600_set_constant_buffer(struct pipe_context *ctx, + enum pipe_shader_type shader, uint index, const struct pipe_constant_buffer *input) { struct r600_context *rctx = (struct r600_context *)ctx; diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index a41b243eec8..f7cf6b72614 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -1135,7 +1135,7 @@ void si_set_rw_buffer(struct si_context *sctx, } static void si_pipe_set_constant_buffer(struct pipe_context *ctx, - uint shader, uint slot, + enum pipe_shader_type shader, uint slot, const struct pipe_constant_buffer *input) { struct si_context *sctx = (struct si_context *)ctx; diff --git a/src/gallium/drivers/rbug/rbug_context.c b/src/gallium/drivers/rbug/rbug_context.c index 268cf00a777..5d002076b49 100644 --- a/src/gallium/drivers/rbug/rbug_context.c +++ b/src/gallium/drivers/rbug/rbug_context.c @@ -623,7 +623,7 @@ rbug_set_clip_state(struct pipe_context *_pipe, static void rbug_set_constant_buffer(struct pipe_context *_pipe, - uint shader, + enum pipe_shader_type shader, uint index, const struct pipe_constant_buffer *_cb) { diff --git a/src/gallium/drivers/softpipe/sp_state_shader.c b/src/gallium/drivers/softpipe/sp_state_shader.c index b2eda244268..da4792757f1 100644 --- a/src/gallium/drivers/softpipe/sp_state_shader.c +++ b/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); diff --git a/src/gallium/drivers/svga/svga_pipe_constants.c b/src/gallium/drivers/svga/svga_pipe_constants.c index b88cdb1e632..d3535357fcd 100644 --- a/src/gallium/drivers/svga/svga_pipe_constants.c +++ b/src/gallium/drivers/svga/svga_pipe_constants.c @@ -45,7 +45,7 @@ struct svga_constbuf static void svga_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 svga_screen *svgascreen = svga_screen(pipe->screen); diff --git a/src/gallium/drivers/swr/swr_state.cpp b/src/gallium/drivers/swr/swr_state.cpp index fb284d8576f..db214af9936 100644 --- a/src/gallium/drivers/swr/swr_state.cpp +++ b/src/gallium/drivers/swr/swr_state.cpp @@ -457,7 +457,7 @@ swr_delete_gs_state(struct pipe_context *pipe, void *gs) static void swr_set_constant_buffer(struct pipe_context *pipe, - uint shader, + enum pipe_shader_type shader, uint index, const struct pipe_constant_buffer *cb) { diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c index 4024dddde89..18032380d2d 100644 --- a/src/gallium/drivers/trace/tr_context.c +++ b/src/gallium/drivers/trace/tr_context.c @@ -742,7 +742,7 @@ trace_context_set_sample_mask(struct pipe_context *_pipe, static void trace_context_set_constant_buffer(struct pipe_context *_pipe, - uint shader, uint index, + enum pipe_shader_type shader, uint index, const struct pipe_constant_buffer *constant_buffer) { struct trace_context *tr_ctx = trace_context(_pipe); diff --git a/src/gallium/drivers/vc4/vc4_state.c b/src/gallium/drivers/vc4/vc4_state.c index 5403c34af96..2e00104e459 100644 --- a/src/gallium/drivers/vc4/vc4_state.c +++ b/src/gallium/drivers/vc4/vc4_state.c @@ -374,7 +374,8 @@ vc4_vertex_state_bind(struct pipe_context *pctx, void *hwcso) } static void -vc4_set_constant_buffer(struct pipe_context *pctx, uint shader, uint index, +vc4_set_constant_buffer(struct pipe_context *pctx, + enum pipe_shader_type shader, uint index, const struct pipe_constant_buffer *cb) { struct vc4_context *vc4 = vc4_context(pctx); diff --git a/src/gallium/drivers/virgl/virgl_context.c b/src/gallium/drivers/virgl/virgl_context.c index 65ca9b32437..4b990a6a5d0 100644 --- a/src/gallium/drivers/virgl/virgl_context.c +++ b/src/gallium/drivers/virgl/virgl_context.c @@ -425,7 +425,7 @@ static void virgl_hw_set_index_buffer(struct pipe_context *ctx, } static void virgl_set_constant_buffer(struct pipe_context *ctx, - uint shader, uint index, + enum pipe_shader_type shader, uint index, const struct pipe_constant_buffer *buf) { struct virgl_context *vctx = virgl_context(ctx); diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h index 49e366a74eb..fee26f383c7 100644 --- a/src/gallium/include/pipe/p_context.h +++ b/src/gallium/include/pipe/p_context.h @@ -273,7 +273,7 @@ struct pipe_context { const struct pipe_clip_state * ); void (*set_constant_buffer)( struct pipe_context *, - uint shader, uint index, + enum pipe_shader_type shader, uint index, const struct pipe_constant_buffer *buf ); void (*set_framebuffer_state)( struct pipe_context *, |