From 150bb0fb34b74055c7dd6d2925ce9c5a1d7decf5 Mon Sep 17 00:00:00 2001 From: Christoph Bumiller Date: Fri, 26 Aug 2011 22:59:19 +0200 Subject: [PATCH] nouveau: make data argument of nouveau_context::push_data const --- src/gallium/drivers/nouveau/nouveau_context.h | 2 +- src/gallium/drivers/nv50/nv50_context.h | 2 +- src/gallium/drivers/nv50/nv50_transfer.c | 2 +- src/gallium/drivers/nvc0/nvc0_context.h | 4 ++-- src/gallium/drivers/nvc0/nvc0_transfer.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/nouveau/nouveau_context.h b/src/gallium/drivers/nouveau/nouveau_context.h index 19bf7c84ac7..7b5f3f1ec39 100644 --- a/src/gallium/drivers/nouveau/nouveau_context.h +++ b/src/gallium/drivers/nouveau/nouveau_context.h @@ -14,7 +14,7 @@ struct nouveau_context { struct nouveau_bo *src, unsigned, unsigned, unsigned); void (*push_data)(struct nouveau_context *, struct nouveau_bo *dst, unsigned, unsigned, - unsigned, void *); + unsigned, const void *); }; static INLINE struct nouveau_context * diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h index 384ca8fb4bc..77dbc823c7a 100644 --- a/src/gallium/drivers/nv50/nv50_context.h +++ b/src/gallium/drivers/nv50/nv50_context.h @@ -198,7 +198,7 @@ nv50_m2mf_transfer_rect(struct pipe_screen *pscreen, void nv50_sifc_linear_u8(struct nouveau_context *pipe, struct nouveau_bo *dst, unsigned offset, unsigned domain, - unsigned size, void *data); + unsigned size, const void *data); void nv50_m2mf_copy_linear(struct nouveau_context *pipe, struct nouveau_bo *dst, unsigned dstoff, unsigned dstdom, diff --git a/src/gallium/drivers/nv50/nv50_transfer.c b/src/gallium/drivers/nv50/nv50_transfer.c index 0ff79eb908a..c86c417c071 100644 --- a/src/gallium/drivers/nv50/nv50_transfer.c +++ b/src/gallium/drivers/nv50/nv50_transfer.c @@ -140,7 +140,7 @@ nv50_m2mf_transfer_rect(struct pipe_screen *pscreen, void nv50_sifc_linear_u8(struct nouveau_context *nv, struct nouveau_bo *dst, unsigned offset, unsigned domain, - unsigned size, void *data) + unsigned size, const void *data) { struct nouveau_channel *chan = nv->screen->channel; uint32_t *src = (uint32_t *)data; diff --git a/src/gallium/drivers/nvc0/nvc0_context.h b/src/gallium/drivers/nvc0/nvc0_context.h index aa50df076b1..353a5418dd5 100644 --- a/src/gallium/drivers/nvc0/nvc0_context.h +++ b/src/gallium/drivers/nvc0/nvc0_context.h @@ -204,8 +204,8 @@ nvc0_m2mf_transfer_rect(struct pipe_screen *pscreen, uint32_t nblocksx, uint32_t nblocksy); void nvc0_m2mf_push_linear(struct nouveau_context *nv, - struct nouveau_bo *dst, unsigned offset, unsigned domain, - unsigned size, void *data); + struct nouveau_bo *dst, unsigned offset, unsigned domain, + unsigned size, const void *data); void nvc0_m2mf_copy_linear(struct nouveau_context *nv, struct nouveau_bo *dst, unsigned dstoff, unsigned dstdom, diff --git a/src/gallium/drivers/nvc0/nvc0_transfer.c b/src/gallium/drivers/nvc0/nvc0_transfer.c index ecc9e213250..69d4a90ed3d 100644 --- a/src/gallium/drivers/nvc0/nvc0_transfer.c +++ b/src/gallium/drivers/nvc0/nvc0_transfer.c @@ -105,7 +105,7 @@ nvc0_m2mf_transfer_rect(struct pipe_screen *pscreen, void nvc0_m2mf_push_linear(struct nouveau_context *nv, struct nouveau_bo *dst, unsigned offset, unsigned domain, - unsigned size, void *data) + unsigned size, const void *data) { struct nouveau_channel *chan = nv->screen->channel; uint32_t *src = (uint32_t *)data; -- 2.30.2