diff options
| author | Vinson Lee <[email protected]> | 2010-12-09 14:03:58 -0800 |
|---|---|---|
| committer | Vinson Lee <[email protected]> | 2010-12-09 14:03:58 -0800 |
| commit | af5f7b3260dfe3f0910e5fa6fac1786413eb0f13 (patch) | |
| tree | d97f2a02a416167fe32449b5cb43ec49c41ffbf9 | |
| parent | 121079bd679ea0729834cca79ab3c424e006feed (diff) | |
r600g: Fix SCons build.
| -rw-r--r-- | src/gallium/drivers/r600/SConscript | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_upload.c | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/r600/drm/SConscript | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/r600/drm/r600_bo.c | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/gallium/drivers/r600/SConscript b/src/gallium/drivers/r600/SConscript index 3fc1fa94c27..64980140963 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 bea0fd4f0c5..ac72854ab16 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; diff --git a/src/gallium/winsys/r600/drm/SConscript b/src/gallium/winsys/r600/drm/SConscript index cc053c06dd0..dac0097f144 100644 --- a/src/gallium/winsys/r600/drm/SConscript +++ b/src/gallium/winsys/r600/drm/SConscript @@ -6,12 +6,12 @@ r600_sources = [ 'bof.c', 'evergreen_hw_context.c', 'radeon_bo.c', - 'radeon_bo_pb.c', 'radeon_pciid.c', 'r600.c', 'r600_bo.c', 'r600_drm.c', 'r600_hw_context.c', + 'r600_bomgr.c', ] env.ParseConfig('pkg-config --cflags libdrm_radeon') diff --git a/src/gallium/winsys/r600/drm/r600_bo.c b/src/gallium/winsys/r600/drm/r600_bo.c index 933b169935f..137402c7064 100644 --- a/src/gallium/winsys/r600/drm/r600_bo.c +++ b/src/gallium/winsys/r600/drm/r600_bo.c @@ -113,7 +113,7 @@ void *r600_bo_map(struct radeon *radeon, struct r600_bo *bo, unsigned usage, voi if (usage & PB_USAGE_UNSYNCHRONIZED) { radeon_bo_map(radeon, bo->bo); - return bo->bo->data + bo->offset; + return (uint8_t *) bo->bo->data + bo->offset; } if (p_atomic_read(&bo->bo->reference.count) > 1) { @@ -143,7 +143,7 @@ void *r600_bo_map(struct radeon *radeon, struct r600_bo *bo, unsigned usage, voi } out: - return bo->bo->data + bo->offset; + return (uint8_t *) bo->bo->data + bo->offset; } void r600_bo_unmap(struct radeon *radeon, struct r600_bo *bo) |