Module: Mesa
Branch: master
Commit: ef534b9389bc74b007d76d2a1776068d23e5b887
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef534b9389bc74b007d76d2a1776068d23e5b887
Author: Rob Clark <robcl...@freedesktop.org>
Date: Tue Jun 7 14:29:01 2016 -0400
gallium: make constant_buffer const
Signed-off-by: Rob Clark <robcl...@freedesktop.org>
Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com>
---
src/gallium/drivers/ddebug/dd_context.c | 2 +-
src/gallium/drivers/freedreno/freedreno_state.c | 2 +-
src/gallium/drivers/i915/i915_state.c | 2 +-
src/gallium/drivers/ilo/ilo_state.c | 2 +-
src/gallium/drivers/llvmpipe/lp_state_fs.c | 2 +-
src/gallium/drivers/noop/noop_state.c | 2 +-
src/gallium/drivers/nouveau/nv30/nv30_state.c | 2 +-
src/gallium/drivers/nouveau/nv50/nv50_state.c | 2 +-
src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 2 +-
src/gallium/drivers/r300/r300_state.c | 2 +-
src/gallium/drivers/r600/r600_state_common.c | 2 +-
src/gallium/drivers/radeonsi/si_descriptors.c | 6 +++---
src/gallium/drivers/radeonsi/si_state.h | 3 +--
src/gallium/drivers/rbug/rbug_context.c | 2 +-
src/gallium/drivers/softpipe/sp_state_shader.c | 2 +-
src/gallium/drivers/svga/svga_pipe_constants.c | 2 +-
src/gallium/drivers/swr/swr_state.cpp | 2 +-
src/gallium/drivers/trace/tr_context.c | 2 +-
src/gallium/drivers/vc4/vc4_state.c | 2 +-
src/gallium/drivers/virgl/virgl_context.c | 2 +-
src/gallium/include/pipe/p_context.h | 2 +-
21 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/gallium/drivers/ddebug/dd_context.c
b/src/gallium/drivers/ddebug/dd_context.c
index b88df92..785dde7 100644
--- a/src/gallium/drivers/ddebug/dd_context.c
+++ b/src/gallium/drivers/ddebug/dd_context.c
@@ -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;
diff --git a/src/gallium/drivers/freedreno/freedreno_state.c
b/src/gallium/drivers/freedreno/freedreno_state.c
index e4df909..53ea39b 100644
--- a/src/gallium/drivers/freedreno/freedreno_state.c
+++ b/src/gallium/drivers/freedreno/freedreno_state.c
@@ -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];
diff --git a/src/gallium/drivers/i915/i915_state.c
b/src/gallium/drivers/i915/i915_state.c
index 8fa2f42..2efa14e 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,
- 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;
diff --git a/src/gallium/drivers/ilo/ilo_state.c
b/src/gallium/drivers/ilo/ilo_state.c
index 37234ec..53a5aca 100644
--- a/src/gallium/drivers/ilo/ilo_state.c
+++ b/src/gallium/drivers/ilo/ilo_state.c
@@ -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;
diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c
b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index 3a678e3..b110202 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -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;
diff --git a/src/gallium/drivers/noop/noop_state.c
b/src/gallium/drivers/noop/noop_state.c
index fe5b5e4..0ddffa2 100644
--- a/src/gallium/drivers/noop/noop_state.c
+++ b/src/gallium/drivers/noop/noop_state.c
@@ -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)
{
}
diff --git a/src/gallium/drivers/nouveau/nv30/nv30_state.c
b/src/gallium/drivers/nouveau/nv30/nv30_state.c
index fd604c2..3655e0c 100644
--- a/src/gallium/drivers/nouveau/nv30/nv30_state.c
+++ b/src/gallium/drivers/nouveau/nv30/nv30_state.c
@@ -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;
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_state.c
b/src/gallium/drivers/nouveau/nv50/nv50_state.c
index 9f5b5cb..a84c9e2 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_state.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_state.c
@@ -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;
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
index 2fbe817..4173d06 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
@@ -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;
diff --git a/src/gallium/drivers/r300/r300_state.c
b/src/gallium/drivers/r300/r300_state.c
index 1063cce..01ccd46 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,
- struct pipe_constant_buffer *cb)
+ const struct pipe_constant_buffer *cb)
{
struct r300_context* r300 = r300_context(pipe);
struct r300_constant_buffer *cbuf;
diff --git a/src/gallium/drivers/r600/r600_state_common.c
b/src/gallium/drivers/r600/r600_state_common.c
index 3f8c7b2..1ca583c 100644
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -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];
diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c
b/src/gallium/drivers/radeonsi/si_descriptors.c
index 5ad251f..55686e8 100644
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -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;
diff --git a/src/gallium/drivers/radeonsi/si_state.h
b/src/gallium/drivers/radeonsi/si_state.h
index ab34fec..8d538e1 100644
--- a/src/gallium/drivers/radeonsi/si_state.h
+++ b/src/gallium/drivers/radeonsi/si_state.h
@@ -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;
diff --git a/src/gallium/drivers/rbug/rbug_context.c
b/src/gallium/drivers/rbug/rbug_context.c
index 54564c1..77f09b0 100644
--- a/src/gallium/drivers/rbug/rbug_context.c
+++ b/src/gallium/drivers/rbug/rbug_context.c
@@ -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;
diff --git a/src/gallium/drivers/softpipe/sp_state_shader.c
b/src/gallium/drivers/softpipe/sp_state_shader.c
index 38673d8..a745662 100644
--- a/src/gallium/drivers/softpipe/sp_state_shader.c
+++ b/src/gallium/drivers/softpipe/sp_state_shader.c
@@ -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;
diff --git a/src/gallium/drivers/svga/svga_pipe_constants.c
b/src/gallium/drivers/svga/svga_pipe_constants.c
index 204b13c..b88cdb1 100644
--- a/src/gallium/drivers/svga/svga_pipe_constants.c
+++ b/src/gallium/drivers/svga/svga_pipe_constants.c
@@ -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);
diff --git a/src/gallium/drivers/swr/swr_state.cpp
b/src/gallium/drivers/swr/swr_state.cpp
index 1f34365..31745fca 100644
--- a/src/gallium/drivers/swr/swr_state.cpp
+++ b/src/gallium/drivers/swr/swr_state.cpp
@@ -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;
diff --git a/src/gallium/drivers/trace/tr_context.c
b/src/gallium/drivers/trace/tr_context.c
index 7ea5946..0412dd7 100644
--- a/src/gallium/drivers/trace/tr_context.c
+++ b/src/gallium/drivers/trace/tr_context.c
@@ -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;
diff --git a/src/gallium/drivers/vc4/vc4_state.c
b/src/gallium/drivers/vc4/vc4_state.c
index 7e0ada7..7aa3931 100644
--- a/src/gallium/drivers/vc4/vc4_state.c
+++ b/src/gallium/drivers/vc4/vc4_state.c
@@ -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];
diff --git a/src/gallium/drivers/virgl/virgl_context.c
b/src/gallium/drivers/virgl/virgl_context.c
index d2d1617..27e85a8 100644
--- a/src/gallium/drivers/virgl/virgl_context.c
+++ b/src/gallium/drivers/virgl/virgl_context.c
@@ -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);
diff --git a/src/gallium/include/pipe/p_context.h
b/src/gallium/include/pipe/p_context.h
index 7319835..67ee5cc 100644
--- a/src/gallium/include/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
@@ -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 * );
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
