Module: Mesa
Branch: master
Commit: e1c1c40cbcf3eec91bef8b38df8057eac52ce1ab
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e1c1c40cbcf3eec91bef8b38df8057eac52ce1ab
Author: Rob Clark <robcl...@freedesktop.org>
Date: Tue Jun 7 12:49:37 2016 -0400
gallium: make shader_buffers const
Be consistent with the rest of the "set_xyz" state interfaces.
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/nouveau/nvc0/nvc0_state.c | 6 +++---
src/gallium/drivers/radeonsi/si_descriptors.c | 4 ++--
src/gallium/drivers/softpipe/sp_state_image.c | 2 +-
src/gallium/drivers/trace/tr_context.c | 2 +-
src/gallium/include/pipe/p_context.h | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/gallium/drivers/ddebug/dd_context.c
b/src/gallium/drivers/ddebug/dd_context.c
index 0f8ef18..b88df92 100644
--- a/src/gallium/drivers/ddebug/dd_context.c
+++ b/src/gallium/drivers/ddebug/dd_context.c
@@ -504,7 +504,7 @@ dd_context_set_shader_images(struct pipe_context *_pipe,
unsigned shader,
static void
dd_context_set_shader_buffers(struct pipe_context *_pipe, unsigned shader,
unsigned start, unsigned num_buffers,
- struct pipe_shader_buffer *buffers)
+ const struct pipe_shader_buffer *buffers)
{
struct dd_context *dctx = dd_context(_pipe);
struct pipe_context *pipe = dctx->pipe;
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
index 7e42be7..2fbe817 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
@@ -1332,8 +1332,8 @@ nvc0_set_shader_images(struct pipe_context *pipe,
unsigned shader,
static bool
nvc0_bind_buffers_range(struct nvc0_context *nvc0, const unsigned t,
- unsigned start, unsigned nr,
- struct pipe_shader_buffer *pbuffers)
+ unsigned start, unsigned nr,
+ const struct pipe_shader_buffer *pbuffers)
{
const unsigned end = start + nr;
unsigned mask = 0;
@@ -1383,7 +1383,7 @@ static void
nvc0_set_shader_buffers(struct pipe_context *pipe,
unsigned shader,
unsigned start, unsigned nr,
- struct pipe_shader_buffer *buffers)
+ const struct pipe_shader_buffer *buffers)
{
const unsigned s = nvc0_shader_stage(shader);
if (!nvc0_bind_buffers_range(nvc0_context(pipe), s, start, nr, buffers))
diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c
b/src/gallium/drivers/radeonsi/si_descriptors.c
index 2d780e6..5ad251f 100644
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -1040,7 +1040,7 @@ si_shader_buffer_descriptors(struct si_context *sctx,
unsigned shader)
static void si_set_shader_buffers(struct pipe_context *ctx, unsigned shader,
unsigned start_slot, unsigned count,
- struct pipe_shader_buffer *sbuffers)
+ const struct pipe_shader_buffer *sbuffers)
{
struct si_context *sctx = (struct si_context *)ctx;
struct si_buffer_resources *buffers = &sctx->shader_buffers[shader];
@@ -1050,7 +1050,7 @@ static void si_set_shader_buffers(struct pipe_context
*ctx, unsigned shader,
assert(start_slot + count <= SI_NUM_SHADER_BUFFERS);
for (i = 0; i < count; ++i) {
- struct pipe_shader_buffer *sbuffer = sbuffers ? &sbuffers[i] :
NULL;
+ const struct pipe_shader_buffer *sbuffer = sbuffers ?
&sbuffers[i] : NULL;
struct r600_resource *buf;
unsigned slot = start_slot + i;
uint32_t *desc = descs->list + slot * 4;
diff --git a/src/gallium/drivers/softpipe/sp_state_image.c
b/src/gallium/drivers/softpipe/sp_state_image.c
index b1810d3..81bb7ca 100644
--- a/src/gallium/drivers/softpipe/sp_state_image.c
+++ b/src/gallium/drivers/softpipe/sp_state_image.c
@@ -56,7 +56,7 @@ static void softpipe_set_shader_buffers(struct pipe_context
*pipe,
unsigned shader,
unsigned start,
unsigned num,
- struct pipe_shader_buffer *buffers)
+ const struct pipe_shader_buffer
*buffers)
{
struct softpipe_context *softpipe = softpipe_context(pipe);
unsigned i;
diff --git a/src/gallium/drivers/trace/tr_context.c
b/src/gallium/drivers/trace/tr_context.c
index 18c5c43..7ea5946 100644
--- a/src/gallium/drivers/trace/tr_context.c
+++ b/src/gallium/drivers/trace/tr_context.c
@@ -1671,7 +1671,7 @@ trace_context_set_tess_state(struct pipe_context
*_context,
static void trace_context_set_shader_buffers(struct pipe_context *_context,
unsigned shader,
unsigned start, unsigned nr,
- struct pipe_shader_buffer
*buffers)
+ const struct pipe_shader_buffer
*buffers)
{
struct trace_context *tr_context = trace_context(_context);
struct pipe_context *context = tr_context->pipe;
diff --git a/src/gallium/include/pipe/p_context.h
b/src/gallium/include/pipe/p_context.h
index 6fde875..7319835 100644
--- a/src/gallium/include/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
@@ -314,7 +314,7 @@ struct pipe_context {
*/
void (*set_shader_buffers)(struct pipe_context *, unsigned shader,
unsigned start_slot, unsigned count,
- struct pipe_shader_buffer *buffers);
+ const struct pipe_shader_buffer *buffers);
/**
* Bind an array of images that will be used by a shader.
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
