diff options
| author | Vinson Lee <vlee@vmware.com> | 2010-12-09 14:03:58 -0800 |
|---|---|---|
| committer | Vinson Lee <vlee@vmware.com> | 2010-12-09 14:03:58 -0800 |
| commit | af5f7b3260dfe3f0910e5fa6fac1786413eb0f13 (patch) | |
| tree | d97f2a02a416167fe32449b5cb43ec49c41ffbf9 /src/gallium/drivers/r600 | |
| parent | 121079bd679ea0729834cca79ab3c424e006feed (diff) | |
r600g: Fix SCons build.
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/SConscript | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_upload.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/SConscript b/src/gallium/drivers/r600/SConscript index 3fc1fa94c2..6498014096 100644 --- a/src/gallium/drivers/r600/SConscript +++ b/src/gallium/drivers/r600/SConscript @@ -28,6 +28,7 @@ r600 = env.ConvenienceLibrary( 'r600_state_common.c', 'r600_texture.c', 'r600_translate.c', + 'r600_upload.c', 'r700_asm.c', 'evergreen_state.c', 'eg_asm.c', diff --git a/src/gallium/drivers/r600/r600_upload.c b/src/gallium/drivers/r600/r600_upload.c index bea0fd4f0c..ac72854ab1 100644 --- a/src/gallium/drivers/r600/r600_upload.c +++ b/src/gallium/drivers/r600/r600_upload.c @@ -102,7 +102,7 @@ int r600_upload_buffer(struct r600_upload *upload, unsigned offset, } in_ptr = in_buffer->user_buffer; - memcpy(upload->ptr + upload->offset, in_ptr + offset, size); + memcpy(upload->ptr + upload->offset, (uint8_t *) in_ptr + offset, size); *out_offset = upload->offset; *out_size = upload->size; *out_buffer = upload->buffer; |