Mesa (master): nouveau: make data argument of nouveau_context:: push_data const
Christoph Bumiller
chrisbmr at kemper.freedesktop.org
Wed Sep 14 14:22:33 UTC 2011
Module: Mesa
Branch: master
Commit: 150bb0fb34b74055c7dd6d2925ce9c5a1d7decf5
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=150bb0fb34b74055c7dd6d2925ce9c5a1d7decf5
Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date: Fri Aug 26 22:59:19 2011 +0200
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 19bf7c8..7b5f3f1 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 384ca8f..77dbc82 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 0ff79eb..c86c417 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 aa50df0..353a541 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 ecc9e21..69d4a90 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;
More information about the mesa-commit
mailing list