Signed-off-by: Rob Clark <robclark@freedesktop.org> Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>tags/13.0-branchpoint
| @@ -343,7 +343,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, | |||
| struct pipe_constant_buffer *constant_buffer) | |||
| const struct pipe_constant_buffer *constant_buffer) | |||
| { | |||
| struct dd_context *dctx = dd_context(_pipe); | |||
| struct pipe_context *pipe = dctx->pipe; | |||
| @@ -89,7 +89,7 @@ fd_set_sample_mask(struct pipe_context *pctx, unsigned sample_mask) | |||
| */ | |||
| static void | |||
| fd_set_constant_buffer(struct pipe_context *pctx, uint shader, uint index, | |||
| struct pipe_constant_buffer *cb) | |||
| const struct pipe_constant_buffer *cb) | |||
| { | |||
| struct fd_context *ctx = fd_context(pctx); | |||
| struct fd_constbuf_stateobj *so = &ctx->constbuf[shader]; | |||
| @@ -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, | |||
| struct pipe_constant_buffer *cb) | |||
| const struct pipe_constant_buffer *cb) | |||
| { | |||
| struct i915_context *i915 = i915_context(pipe); | |||
| struct pipe_resource *buf = cb ? cb->buffer : NULL; | |||
| @@ -1536,7 +1536,7 @@ ilo_set_clip_state(struct pipe_context *pipe, | |||
| static void | |||
| ilo_set_constant_buffer(struct pipe_context *pipe, | |||
| uint shader, uint index, | |||
| struct pipe_constant_buffer *buf) | |||
| const struct pipe_constant_buffer *buf) | |||
| { | |||
| const struct ilo_dev *dev = ilo_context(pipe)->dev; | |||
| struct ilo_state_vector *vec = &ilo_context(pipe)->state_vector; | |||
| @@ -2836,7 +2836,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, | |||
| struct pipe_constant_buffer *cb) | |||
| const struct pipe_constant_buffer *cb) | |||
| { | |||
| struct llvmpipe_context *llvmpipe = llvmpipe_context(pipe); | |||
| struct pipe_resource *constants = cb ? cb->buffer : NULL; | |||
| @@ -176,7 +176,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, | |||
| struct pipe_constant_buffer *cb) | |||
| const struct pipe_constant_buffer *cb) | |||
| { | |||
| } | |||
| @@ -327,7 +327,7 @@ 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, | |||
| struct pipe_constant_buffer *cb) | |||
| const struct pipe_constant_buffer *cb) | |||
| { | |||
| struct nv30_context *nv30 = nv30_context(pipe); | |||
| struct pipe_resource *buf = cb ? cb->buffer : NULL; | |||
| @@ -842,7 +842,7 @@ nv50_cp_state_bind(struct pipe_context *pipe, void *hwcso) | |||
| static void | |||
| nv50_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index, | |||
| struct pipe_constant_buffer *cb) | |||
| const struct pipe_constant_buffer *cb) | |||
| { | |||
| struct nv50_context *nv50 = nv50_context(pipe); | |||
| struct pipe_resource *res = cb ? cb->buffer : NULL; | |||
| @@ -831,7 +831,7 @@ nvc0_cp_state_bind(struct pipe_context *pipe, void *hwcso) | |||
| static void | |||
| nvc0_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index, | |||
| struct pipe_constant_buffer *cb) | |||
| const struct pipe_constant_buffer *cb) | |||
| { | |||
| struct nvc0_context *nvc0 = nvc0_context(pipe); | |||
| struct pipe_resource *res = cb ? cb->buffer : NULL; | |||
| @@ -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, | |||
| struct pipe_constant_buffer *cb) | |||
| const struct pipe_constant_buffer *cb) | |||
| { | |||
| struct r300_context* r300 = r300_context(pipe); | |||
| struct r300_constant_buffer *cbuf; | |||
| @@ -1053,7 +1053,7 @@ 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, | |||
| struct pipe_constant_buffer *input) | |||
| const struct pipe_constant_buffer *input) | |||
| { | |||
| struct r600_context *rctx = (struct r600_context *)ctx; | |||
| struct r600_constbuf_state *state = &rctx->constbuf_state[shader]; | |||
| @@ -940,7 +940,7 @@ void si_upload_const_buffer(struct si_context *sctx, struct r600_resource **rbuf | |||
| static void si_set_constant_buffer(struct si_context *sctx, | |||
| struct si_buffer_resources *buffers, | |||
| unsigned descriptors_idx, | |||
| uint slot, struct pipe_constant_buffer *input) | |||
| uint slot, const struct pipe_constant_buffer *input) | |||
| { | |||
| struct si_descriptors *descs = &sctx->descriptors[descriptors_idx]; | |||
| assert(slot < descs->num_elements); | |||
| @@ -1003,7 +1003,7 @@ static void si_set_constant_buffer(struct si_context *sctx, | |||
| } | |||
| void si_set_rw_buffer(struct si_context *sctx, | |||
| uint slot, struct pipe_constant_buffer *input) | |||
| uint slot, const struct pipe_constant_buffer *input) | |||
| { | |||
| si_set_constant_buffer(sctx, &sctx->rw_buffers, | |||
| SI_DESCS_RW_BUFFERS, slot, input); | |||
| @@ -1011,7 +1011,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, | |||
| struct pipe_constant_buffer *input) | |||
| const struct pipe_constant_buffer *input) | |||
| { | |||
| struct si_context *sctx = (struct si_context *)ctx; | |||
| @@ -302,8 +302,7 @@ void si_emit_graphics_shader_userdata(struct si_context *sctx, | |||
| struct r600_atom *atom); | |||
| void si_emit_compute_shader_userdata(struct si_context *sctx); | |||
| void si_set_rw_buffer(struct si_context *sctx, | |||
| uint slot, struct pipe_constant_buffer *input); | |||
| uint slot, const struct pipe_constant_buffer *input); | |||
| /* si_state.c */ | |||
| struct si_shader_selector; | |||
| @@ -624,7 +624,7 @@ static void | |||
| rbug_set_constant_buffer(struct pipe_context *_pipe, | |||
| uint shader, | |||
| uint index, | |||
| struct pipe_constant_buffer *_cb) | |||
| const struct pipe_constant_buffer *_cb) | |||
| { | |||
| struct rbug_context *rb_pipe = rbug_context(_pipe); | |||
| struct pipe_context *pipe = rb_pipe->pipe; | |||
| @@ -338,7 +338,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, | |||
| struct pipe_constant_buffer *cb) | |||
| const struct pipe_constant_buffer *cb) | |||
| { | |||
| struct softpipe_context *softpipe = softpipe_context(pipe); | |||
| struct pipe_resource *constants = cb ? cb->buffer : NULL; | |||
| @@ -46,7 +46,7 @@ struct svga_constbuf | |||
| static void svga_set_constant_buffer(struct pipe_context *pipe, | |||
| uint shader, uint index, | |||
| struct pipe_constant_buffer *cb) | |||
| const struct pipe_constant_buffer *cb) | |||
| { | |||
| struct svga_screen *svgascreen = svga_screen(pipe->screen); | |||
| struct svga_context *svga = svga_context(pipe); | |||
| @@ -409,7 +409,7 @@ static void | |||
| swr_set_constant_buffer(struct pipe_context *pipe, | |||
| uint shader, | |||
| uint index, | |||
| struct pipe_constant_buffer *cb) | |||
| const struct pipe_constant_buffer *cb) | |||
| { | |||
| struct swr_context *ctx = swr_context(pipe); | |||
| struct pipe_resource *constants = cb ? cb->buffer : NULL; | |||
| @@ -772,7 +772,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, | |||
| struct pipe_constant_buffer *constant_buffer) | |||
| const struct pipe_constant_buffer *constant_buffer) | |||
| { | |||
| struct trace_context *tr_ctx = trace_context(_pipe); | |||
| struct pipe_context *pipe = tr_ctx->pipe; | |||
| @@ -375,7 +375,7 @@ vc4_vertex_state_bind(struct pipe_context *pctx, void *hwcso) | |||
| static void | |||
| vc4_set_constant_buffer(struct pipe_context *pctx, uint shader, uint index, | |||
| struct pipe_constant_buffer *cb) | |||
| const struct pipe_constant_buffer *cb) | |||
| { | |||
| struct vc4_context *vc4 = vc4_context(pctx); | |||
| struct vc4_constbuf_stateobj *so = &vc4->constbuf[shader]; | |||
| @@ -426,7 +426,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, | |||
| struct pipe_constant_buffer *buf) | |||
| const struct pipe_constant_buffer *buf) | |||
| { | |||
| struct virgl_context *vctx = virgl_context(ctx); | |||
| @@ -261,7 +261,7 @@ struct pipe_context { | |||
| void (*set_constant_buffer)( struct pipe_context *, | |||
| uint shader, uint index, | |||
| struct pipe_constant_buffer *buf ); | |||
| const struct pipe_constant_buffer *buf ); | |||
| void (*set_framebuffer_state)( struct pipe_context *, | |||
| const struct pipe_framebuffer_state * ); | |||