diff options
| author | Marek Olšák <[email protected]> | 2013-01-26 14:50:36 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-01-26 14:50:36 +0100 |
| commit | edc38330da7cc9f87c94d8873f4d2244fc422807 (patch) | |
| tree | 045ee7d10ff86e1f09ff1dfeab22fb593b046095 | |
| parent | f951f2f52cdd68c6a573dc04222bcc8c9a6d4251 (diff) | |
r600g: fix compile warnings in r600_cp_dma_copy_buffer on 32-bit gcc
| -rw-r--r-- | src/gallium/drivers/r600/r600.h | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_hw_context.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h index 06e914f4538..2734594987e 100644 --- a/src/gallium/drivers/r600/r600.h +++ b/src/gallium/drivers/r600/r600.h @@ -172,8 +172,8 @@ void r600_context_streamout_end(struct r600_context *ctx); void r600_need_cs_space(struct r600_context *ctx, unsigned num_dw, boolean count_draw_in); void r600_context_block_emit_dirty(struct r600_context *ctx, struct r600_block *block, unsigned pkt_flags); void r600_cp_dma_copy_buffer(struct r600_context *rctx, - struct pipe_resource *dst, unsigned long dst_offset, - struct pipe_resource *src, unsigned long src_offset, + struct pipe_resource *dst, uint64_t dst_offset, + struct pipe_resource *src, uint64_t src_offset, unsigned size); int evergreen_context_init(struct r600_context *ctx); diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c index e13b502b517..723a61f98ef 100644 --- a/src/gallium/drivers/r600/r600_hw_context.c +++ b/src/gallium/drivers/r600/r600_hw_context.c @@ -1065,8 +1065,8 @@ void r600_context_streamout_end(struct r600_context *ctx) #define CP_DMA_MAX_BYTE_COUNT ((1 << 21) - 8) void r600_cp_dma_copy_buffer(struct r600_context *rctx, - struct pipe_resource *dst, unsigned long dst_offset, - struct pipe_resource *src, unsigned long src_offset, + struct pipe_resource *dst, uint64_t dst_offset, + struct pipe_resource *src, uint64_t src_offset, unsigned size) { struct radeon_winsys_cs *cs = rctx->cs; |